some code style fixes
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
Merge pull request #37 from beanieboi/feature/code-style

some code style fixes