what am i doing
Merge branch 'master' of github.com:brynedwards/dotfiles

im so lost
unswitch : and ;
Better vim
Merge branch 'master' of github.com:brynedwards/dotfiles

Conflicts:
	bin/pass
	vimrc
yep