update
Merge branch 'master' of github.com:dtjm/dotfiles

Conflicts:
	vimrc.before
update
Merge branch 'master' of github.com:dtjm/dotfiles

Conflicts:
	bash_profile
	gitconfig
Merge branch 'master' of github.com:dtjm/dotfiles

Conflicts:
	gitconfig