Add a few more git aliases
Merge branch 'develop'

* develop:
  Add a few more git aliases
Add .py to .gitattributes and sort in alpha order