Better options
add undo
Merge branch 'master' of github.com:jeffknupp/config_files

Conflicts:
	.vimrc