added links to some routes, adding twitter auth
fixing merge conflicts
Merge branch 'master' of github.com:tylermercier/moody_friends