Merge branch 'master' into development

* Merging in a couple of quick fixes to the README file. Nothing too huge.
Add ffmpeg buildpack to heroku.
Merge pull request #17 from JonathanTR/development

Development