clean up routes
Merge branch 'master' into Clean_UP
merging
Fix routes, merging in Caro's changes
Merge branch 'master' into Clean_UP
Merge pull request #60 from pocket-gophers-2014/Clean_UP

Clean up