Get this building and passing tests

Changes:
* add .DS_Store to .gitignore
* Decode base64 encoded emails for tests
* Pick a version of scikit since the pickled clasifiers are based on that
* Add missing numpy and scipy dependencies

.gitignore

@@ -48,4 +48,7 @@ tramp
 *_archive
 
 # Trial temp
-_trial_temp
+_trial_temp
+
+# OSX
+.DS_Store

setup.py

@@ -18,8 +18,10 @@ setup(name='talon',
           "regex>=1",
           "html2text",
           "nose>=1.2.1",
+          "numpy",
           "mock",
           "coverage",
-          "scikit-learn",
+          "scipy",
+          "scikit-learn==0.16.1", # pickled versions of classifier, else rebuild
           ]
       )

tests/text_quotations_test.py

@@ -618,7 +618,7 @@ def test_standard_replies():
         with open(filename) as f:
             message = email.message_from_file(f)
             body = email.iterators.typed_subpart_iterator(message, subtype='plain').next()
-            text = ''.join(email.iterators.body_line_iterator(body))
+            text = ''.join(email.iterators.body_line_iterator(body, True))
 
             stripped_text = quotations.extract_from_plain(text)
             reply_text_fn = filename[:-4] + '_reply_text'