From devbox
Merge branch 'master' of github.com:bahelms/dotfiles

Conflicts:
	home/.vimrc
Merge branch 'master' of github.com:bahelms/dotfiles
Update cursor highlighting