www-data and fixes
Merge branch 'master' of https://github.com/BKreisel/Hermes-Hackathon