add support for ffmpeg version 2.1.1
Merge branch 'ffmpeg-2.1.1-support'
wrap file path in quotes to accomodate remote files
Update .travis.yml
Update .travis.yml
Merge pull request #19 from doodlehaus/wrap_file_path_in_quotes

wrap file path in quotes to accommodate remote files
add ruby-sl gem for rbx
don't allow rbx to fail anymore
add rubysl-json gem
enable bundler caching on Travis
Merge pull request #21 from beanieboi/feature/fix-rbx-builds

fix builds for rbx
Merge remote-tracking branch 'origin/master' into feature/bundler-caching
Merge pull request #22 from beanieboi/feature/bundler-caching

enable bundler caching on Travis
Merge remote-tracking branch 'upstream/master'
add Codeclimate badge
add manderson to contributors
remove bundler cache for Travis-CI
Merge branch 'master' into feature/codeclimate-badge
Merge branch 'master' into feature/update-contributors
Merge pull request #24 from beanieboi/feature/update-contributors

add manderson to contributors