Remove custom whitespace for javascript files
Merge branch 'master' of github.com:apod/vimfiles

Conflicts:
	vimrc