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

* 'master' of github.com:leek/dotfiles:
  Git hooks updates
  Git hooks and other misc.

Conflicts:
	sublime-text/User/Package Control.sublime-settings
	sublime-text/User/Preferences.sublime-settings
Adding my.cnf for MySQL
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Tweaks and syncing with ohmyzsh

Conflicts:
	sublime-text/User/Preferences.sublime-settings