ugh
vimrc
Merge branch 'master' of github:toddbernhard/dotfiles

Conflicts:
	zsh/prompt.zsh