Changed default editor to Sublime Text instead of Sublime Text 2
Merge branch 'master' of https://github.com/rachelbaker/dotfiles

Merging master branch into work machine
Added recent Sublime Text 2 configuration changes to addons.