Merge branch 'master' of https://github.com/smallgeek/dotfiles

Conflicts:
	.vimrc.indent