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

Conflicts:
	Sublime/User/Package Control.sublime-settings