awesome vim split opening
prettier colors again\!
Merge branch 'master' into work

Conflicts:
	vimrc
Merge branch 'work' of github.com:b-ryan/dotfiles into work