Added more git aliases
Merged gitconfig