OSX autoselection in primary Makefile
Updated documentation for v0.9.6 & Makefile consolidation
Merge branch 'develop'