Changes to get things to run on Travis and fixed email issue

For Travis I had to clean up several issues in the handling of translations.
For email I found that the previous approach didn't really work and ended
up needing to move around a bunch of file.

Moved around th