Formats gitconfig file uniformly
Update git aliases for commit and rebase

Remove commit -m|am alias to encourage better commit messages. Add
rebase alias for ease of use.
Merge branch 'e3' into e3-master