Merged frontend, plus merge resolutions
Housekeeping
More clean-up
Adding .travis.yml
Oops, no tab characters
updated package.json
Fixed postinstall, test command
Updated to express 4.0.0 successfully
Updated deps
Added dependency status banner
Added Travis-CI badge
Updated npm on my laptop, wanted to make things happy
Merge branch 'express-upgrade'
Merged api into master
I'm a big dumb idiot
Removed unnecessary comment