Linking commands necessary for OS X.
ifdef to remove boost join parse error.
Merge branch 'master' of https://github.com/hawesie/scitos_apps into hawesie-master