updates
added package control settings
Merge branch 'master' of github.com:hugochinchilla/dotfiles

Conflicts:
	.config/sublime-text-3/Packages/User/Package Control.sublime-settings
	.config/sublime-text-3/Packages/User/Preferences.sublime-settings