Bumped version
Fixed pathnames
Merge branch 'master' of github.com:janjiss/conred

Conflicts:
	lib/conred/video.rb