cmake apple change
Merge branch 'develop' into feature/python-bindings

Conflicts:
	CMakeLists.txt
Merge branch 'feature/python-bindings' of github.com:golems/grip2 into feature/python-bindings
refactored interface to c++ class rather than static funcs

clobbered some of pete's work in progress though.  will try to merge