Use DiffMerge as git merge tool
Indenty by 4 by default, Set $ as a pre-def global
Add SublimeCodeIntel
Only Lint on load/save - Add Ruby executable for linting
Add "git export" alias
Sublime Text 2: Update bunch of plugins