Imporved installation instructions for Mac OSX
Merge remote-tracking branch 'upstream/master'
Removed parallelization in cython because it was slower.
Merge remote-tracking branch 'upstream/master'