Merge branch 'master' of https://github.com/strands-project/scitos_apps
Merge branch 'master' of https://github.com/strands-project/scitos_apps
Linking changes for OSX
Merge branch 'master' of https://github.com/strands-project/scitos_apps
Merge pull request #50 from hawesie/master

Linking changes for OSX