Some changes
Merge branch 'master' of github.com:lukexor/.dotfiles

Conflicts:
	plugins/git/git.plugin.sh