added git aliases and reorganized aliases file