changes we made manually today

not sure if it's working. must check db fixtures. rest seems to work. Go vagrant!
Merge pull request #1 from ivanistheone/master

changes we made manually today