New git-gutter plugin
Merge branch 'master' of github.com:pgiraud/dotfiles

Conflicts:
	.gitmodules