Add port forwarding for MailCatcher
Update documentation with correct ports
Update optional software to an apt-in model