updated routes and models
Merge branch 'master' of https://github.com/paulrogofsky/Flock