fix location of local.py in gitignore
update vagrantfile with new base box
Merge branch 'master' of github.com:torchbox/wagtaildemo