various nonsense
	modified:   .netrwhist
	new file:   colors/molokai.vim
	modified:   vimrc
Merge branch 'master' of https://github.com/mattfield/dotvim

Conflicts:
	.netrwhist

proper deletion of .netrwhist
	deleted:    .netrwhist
	new file:   colors/crappo.vim
	modified:   vimrc
2 space indent for JS
	modified:   vimrc