Update mysql logging
Add waitTimeout option
Merge pull request #930 from cdjackson/mysql

Add mySQL timeout parameter and update cfg defaults