[UPDATE] update for vagrant use
Merge branch 'dev-master' of https://github.com/etiennegautier/memebay into dev-master