Lots of stuff!
Merge branch 'master' of github.com:stevenocchipinti/homesync

Conflicts:
	data/.aliases