Merge pull request #9 from catburston/development

Development
Merge pull request #15 from catburston/development

Development
Merge pull request #16 from catburston/development

Pull dev to master
Merge pull request #18 from catburston/development

compile assets to build on heroku
Merge pull request #17 from catburston/master

Pull dev to master