Package Control
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Updates
  .gitconfig update

Conflicts:
	sublime-text/User/Package Control.sublime-settings
Updated Sublime settings