Make setup much cooler
Merge branch 'master' of https://github.com/Joushou/dotfiles

Conflicts:
	.setup