Adding 'last' git alias
Fixing gitconfig formatting
Formatting cleanup
Fixing merge conflict