Sync
Update aliases and git info
Minor bash prompt color changes
Merge branch 'master' of https://github.com/shardaroodal/dotfiles

Conflicts:
	.aliases