blah
Merge branch 'master' of github.com:b-ryan/dotfiles

Conflicts:
	vimrc
Merge branch 'master' into work