Add Ian's changes (minus mysql bind_address mapping)