Merge branch 'model'

Conflicts:
osprey-dev2/.DS_Store
osprey-dev2/app/models/user.js
osprey-dev2/app/routes.js
osprey-dev2/config/passport.js
osprey-dev2/public/js/controllers/dashboardMain.js