Memory limit
Readme update
Merge branch 'master' of https://github.com/skullhole/vagrant