cleaned/updated .aliases and sync script
Merge branch 'master' of https://github.com/mikelmcdaniel/config-files

Conflicts:
	.aliases