Various additions in preparation of the hackathon
Merge branch 'master' of github.com:pelagios/scalagios