split huge regular expression to improve readability
simplify matching against regular terms
rewrite river.matches_post?(post)
Merge branch 'master' into xmpp