Fix a Clang error
Unbreak OSX Make File builds
Merge branch 'master' of https://github.com/LightDrake/SingularityViewer