decoupled data and media into two seperate websites
Merge branch 'master' of https://github.com/Bowerbird/bowerbird-web