Strip portal names in xmpp messages
Merge branch 'strip-whitespace-2' of https://github.com/ichthyos/ingress-notify into ichthyos-strip-whitespace-2

Conflicts:
	server/mail.py