update for ffmpeg/ffprobe 2.1.2 and whitespace cleanup

Conflicts:
	lib/ffprober/ffprobe_version.rb
	spec/ffprober/ffprobe_version_spec.rb
added support for ffmpeg/ffprobe 2.1.4
add rspec test for 2.1.4
get rbx working again
Merge pull request #35 from beanieboi/rbx-on-travis

get rbx working again
Merge pull request #33 from mbkulik/upstream

update for ffmpeg/ffprobe 2.1.2 and whitespace cleanup
Merge pull request #34 from mbkulik/ffmpeg-2.1.4-support

Ffmpeg 2.1.4 support
support for ffmpeg/ffprobe version 2.2
Merge pull request #36 from mbkulik/ffmpeg-2.2-support

support for ffmpeg/ffprobe version 2.2
some code style fixes
update Changelog
bump version
Merge branch 'master' into feature/code-style

Conflicts:
	lib/ffprober/ffprobe_version.rb
	lib/ffprober/version.rb
	spec/ffprober/ffprobe_version_spec.rb
	spec/ffprober/parser_spec.rb
Update README.md
Merge pull request #37 from beanieboi/feature/code-style

some code style fixes
code style
Merge remote-tracking branch 'origin/master' into feature/chapters

Conflicts:
	Changes.md
	lib/ffprober.rb
	lib/ffprober/audio_stream.rb
	lib/ffprober/ffprobe_version.rb
	lib/ffprober/format.rb
	lib/ffprober/parser.rb
	lib/ffprober/stream.rb
	lib/ffprober/version.rb
	spec/ffprober/ffprobe_version_spec.rb
	spec/ffprober/parser_spec.rb
	spec/ffprober_spec.rb