Removed the mailcatcher module and supervisord and integrated their code into the base module