Fix/html emails for invite people

@jonlemmon please pull this into master before the mega-merge