Syncing...
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Much needed sync
  Sync

Conflicts:
	sublime-text/User/Package Control.sublime-settings
Sync
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Sync
  Syncing
  Updates

Conflicts:
	brew/zshenv
	npm/zshenv
	sublime-text/User/Package Control.sublime-settings
	sublime-text/User/Preferences.sublime-settings