resolved conflict
Merge branch 'master' of github.com:deshawnbw/env

Conflicts:
	conf/vim/vimrc