Update search paths and sublime prefs
Merge branch 'master' of github.com:mortik/dot-files

Conflicts:
	sublime/Preferences.sublime-settings