Updated install script for Mac OS X
Merge remote-tracking branch 'origin/develop' into develop