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

Conflicts:
	ffprober.gemspec
update Changes
bump to 0.3.6
update gemspec to support files with whitespace
Merge pull request #29 from beanieboi/feature/upgrade-rspec3

upgrade to rspec 3 (beta1)
use the expect syntax for whitespace spec
Merge pull request #31 from beanieboi/bug/fix-rspec-syntax

use the expect syntax for whitespace spec
Merge remote-tracking branch 'upstream/master'