updating ST2 stuff
Merge branch 'master' of github.com:zanshin/dotfiles