got rid of annoying '<>' in git prompt
added some aliases for git commands
Merge branch 'master' of https://github.com/tboz203/config

Conflicts:
	aliases

just random shtuff