added git aliases and reorganized aliases file
Merge pull request #1 from milktrader/master

added git aliases and reorganized aliases file