untrack .vagrant/
Merge branch 'master' of github.com:leonstafford/mini_haskell_webapp