add git swap files to .gitignore
Merge branch 'master' of github.com:mlapshin/vagrant-foodtaster-server
set pretty error message