fixes gh-138 - flapjack jabber responds by alias
fixes gh-142 - updating a NotificationRule now works
Merge branch '138_jabber_use_configured_alias_for_commands'
Merge pull request #139 from jessereynolds/138_jabber_use_configured_alias_for_commands

fixes gh-137 - flapjack jabber responds by alias
Merge branch 'master' of github.com:flpjck/flapjack
Merge branch 'master' into 138_replay_events_from_another_flapjack