Jhbate/emails

contains the cleanup to remove emails and have a working travis build