submit for merge later
Merge branch 'master' of https://github.com/josecanciani/User

Conflicts:
	Package Control.sublime-settings