Updating paths.
Updating paths.
Merge branch 'master' of github.com:times/integratr-video
Moving Josh's stuff.