update
Merge branch 'master' of https://github.com/johannes82/.dotfiles

Conflicts:
	sublime_user/Package Control.sublime-settings
	sublime_user/Preferences.sublime-settings
fixed Preferences and Sidebar