Local changes on server - mostly comments
Merge branch 'master' of https://github.com/grogo/vacation