Fixes for deployment
Merge branch 'master' of https://github.com/kvkirthy/Flock.git