Tidy up plus email working

Requires mysql docker to be installed and running first