add a gitignore
ignore another thing
Merge branch 'master' of github.com:tlevine/vimrc

Conflicts:
	.gitignore