Corrected shuttle configuration
Push to matching branches
Merge branch 'master' of https://github.com/habi/dotfiles

Conflicts:
	.gitconfig