update from imac
Merge branch 'master' of github.com:tung-dang/my-dot-files

Conflicts:
	sublime3/Package Control.sublime-settings
	sublime3/Preferences.sublime-settings