WIP started adding videos for admins
Merge branch 'master' into add_video

Conflicts:
	app/views/layouts/application.html.slim
WIP simple_form config
Cleaned up video factory
Merge pull request #11 from andypike/add_video

Add video