Settling in the code.  Adding regular login endpoints..
Merge commit '7454d0e6812a3af83d20a4bdb3688ca0df577d27'

Conflicts:
	config/routes.js
adding auth back in.
Merge commit '399be878fa275ba7c66b4836ab9cc446ea96d91a' into traditional_login
Merge commit 'c1efa342d03f5b7513ecd04fc05bc616c6e80745'

Conflicts:
	app/controllers/pages.js
	config/routes.js
Adding in Home route.
Merge branch 'pages'
Merge pull request #3 from jeffj/pages

Pages
Merge branch 'pages'
Merge branch 'pages'
search working alpha
Merge branch 'pages' into search

Conflicts:
	app/views/includes/header.jade
Merge branch 'master' of https://github.com/jeffj/hypermarks
getting back to home.