changed to mac osx version
Major refactor.  Works on OSX.
Merge branch 'feature/experiment_with_ptyhon_data' into develop