la-1-3 to mysql
Merged in vhart/mcloud-conf (pull request #622)

la-1-3 to mysql
Merge branch 'master' of bitbucket.org:wdamarillo/mcloud-conf