Minor tweaks
Merge remote-tracking branch 'origin'
Adds .my.cnf to configure mysql command line