Touch up build system.
Merge branch 'master' of https://github.com/aparent/QCViewer
Merge branch 'master' of hfcs.uwaterloo.ca:~/QCViewer