Never mind
Merge branch 'master' of https://github.com/shawa/dotfiles

Conflicts:
	script/install_gitties