Merge branch 'pages'
search page returns results
Merge branch 'pages'
Search and timeline work fully and are linked
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.
refactored header
Merge branch 'header_refactor'
put null checks in pages.js
does not crash for logged out user, design needs work
Merge branch 'logged_out'
Merge branch 'master' into aggregate_public_list
aggregate all bookmarks in system
Merge branch 'master' into aggregate_public_list
Merge branch 'extension_post_and_tree_sync'
extension changes
Merge branch 'master' of https://github.com/jeffj/hypermarks