Add auto paste/nopaste. Reindent file.
Merge branch 'master' of github.com:greglearns/dotfiles

Conflicts:
	vimrc