changes we made manually today

not sure if it's working. must check db fixtures. rest seems to work. Go vagrant!