convert flv to mp4 in batch
bundle package
Merge branch 'master' of github.com:jimknight/youtube

Conflicts:
	app/models/import.rb