small changes
Merge branch 'master' of https://github.com/danielmitd/dotfiles

Conflicts:
	.gitconfig
	dots/.aliases