Package clean up
All code for finding info about video moved to a module
Merge branch 'refs/heads/master' into couch

Conflicts:
	package.json