Merge pull request #1 from scotch-io/master

Update routes.js
Update user.js
Update passport.js