Mysql 5.5 for merge

incorporates Christian work from #160 + a few other 5.5 things