upgrade to rspec 3 (beta1)
Merge remote-tracking branch 'origin/master' into feature/upgrade-rspec3

Conflicts:
	ffprober.gemspec
Merge pull request #29 from beanieboi/feature/upgrade-rspec3

upgrade to rspec 3 (beta1)