Merge branch 'master' of github.com:stockholmuniversity/hermes into cleanup
Build improvements.
Merge pull request #189 from iceglow/cleanup

Cleanup