color
Merge branch 'master' of github.com:russellholt/dot

Conflicts:
	.gitmodules
	vim/after/ftplugin/mkd.vim