Merge branch '138_jabber_use_configured_alias_for_commands'
Merge branch 'master' of github.com:flpjck/flapjack
part of fix for gh-33, unscheduled maintenance in API
fixes gh-147 - bad regex in jabber query
fixes gh-145 - handle media addresses correctly when adding contacts and generating messages
handles no media for severity more gracefully
fix daft error
Merge pull request #149 from jessereynolds/145_error_sending_messages

145 error sending messages