Improved MySQL import options
Merge branch 'master' of https://github.com/swcombine/dev-vm