fix failing test
Merge branch 'ffmpeg-2.0.2-support'
update Changes.md for 0.3.5
bump version
update .ruby-version to the latest ruby
Merge remote-tracking branch 'upstream/master'