Add some aliases
Add couple common git-workflow aliases
Remove OSX specific property of gitconfig.

Until I'll find a way to resolve a conflict on Linux.