tweaks from office air
Merge branch 'master' of github.com:richardc/dotfiles

Conflicts:
	sublime_text/User/Preferences.sublime-settings
update submodules