Webapp stuff that needs to be merged
Merge pull request #45 from dssg/webapp-stuff

Webapp stuff that needs to be merged