Strip portal names in xmpp messages
Fail gracefully when attempting to parse the attacker info
Merge branch 'strip-whitespace-2' of https://github.com/ichthyos/ingress-notify into ichthyos-strip-whitespace-2

Conflicts:
	server/mail.py
Handle InvalidOAuthTokenErrors (fixes #11)
.
Merged from upstream
Bold attacker name in alert message