Tidy up the instance variables and allow the local port to be set
Use the mailcatcher port to send the test emails from travis