Clone opts args that receive :delete to avoid destructive side effects outside
and_return -> block style in expectations
Version 0.0.2.6 -> 0.0.2.7 with non-destruction of opts changes
Merge branch 'master' of github.com:Twistage/helix

Mainly get_stillframe -> stillframe_for and opts cloning

Conflicts:
	lib/helix/video.rb
	spec/video_spec.rb
Delete .swp file auto-added by merge