Merge pull request #28 from openworm/development

Development
Added vars to makefile for setting Python dirs from command-line.
Merge pull request #31 from NHDaly/makefileOSX_python_fix

Fix OSX non-homebrew python install: Added vars to makefile for setting dirs from command-line (to dev branch).
Switched the ifdefs to address issue #39.