git alias
Merge branch 'master' of https://github.com/jbelcher/dotfiles

* 'master' of https://github.com/jbelcher/dotfiles:
  More explicit .gitattributes LF handling
  Added trim trailing whitespace option for ST2