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

* 'master' of github.com:leek/dotfiles:
  Tweaks and Magento additions
  Removing old files
  Adding my.cnf for MySQL
  Syncing...

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