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

Until I'll find a way to resolve a conflict on Linux.
Merge branch 'master' of https://github.com/dentuzhik/dotfiles

Conflicts:
	.bash_aliases