disable mysql gem
Merge branch 'master' of github.com:joelsawyer/wishbott
conflict fix