Enable sublime symbol/defn key map
Add AutoFileName and ES6 packages
Install icdiff
Fix cask install error
Don't automatically merge on 'git pull'
Add git-extras