Added optional subject parameter to insertEmail method, and removed addMap method from base template; it should only be on pages that need a map