Use default MySQL port
Merge branch 'master' of https://github.com/rapid7/conqueso
Beefing up documentation
Merge pull request #5 from stevewillard/master

Beefing up documentation