Move everything to use homes(h)ick syntax
Merge branch 'master' of https://github.com/christianbundy/dotfiles

Conflicts:
	.alias
	.aliases
	home/.alias