server changes; add vagrant to gitignore
Merge branch 'master' of https://github.com/TheSavior/FriendCoin