Updates to installation
Merge branch 'master' of github.com:tbjers/dotfiles

Conflicts:
	bin/dot