Merge branch 'master' into bookmarklet_full_alpha
Cors auth works, still some content type issues
Content type issues solved!
Browserify works again
Browserify is working but messy
Cleanup
update package.json
Bookmarklet all set up, just needs some frontend love
Cleanup
Bookmarklet works, interface needs to be finished out
bookmarklet frontend done
Changed login back to use history.back()
clean up css
Merge branch 'bookmarklet_full_alpha'
JSON dump works
add tests
better parsing
adding to es might work
Bunch of cleanup, routing, schema work

Sorry for the huge commit
getting bookmarks by user works!