fixing more problems from the merge

fixed syntax errors to pass jshint, refactored some of the templates
Merged duplicate changes made to get passport branch working.

Conflicts:
	templates/express/config/passport.js
	templates/express/index.js
	templates/express/mongo/user.js
	templates/express/session.js
	templates/javascript/app.js
	templates/views/html/partials/navbar.html