clean up vimrc
clean up vimrc

Conflicts:
	.vimrc
Merge branch 'master' into twitter