Cleaning up whitespace
Merge branch 'master' of https://github.com/brimanning/simplevideo

Conflicts:
	simplevideo.js