Merge branch 'master' of github.com:woltage/punisher-server
Added .vagrant to ignore