[HTTPS-E Rulesets] Simplify rulesets so they can work with Python

[Osama Khalid]

Python implementation of regex deals with grouping differently.  This
is easy to overcome except when the regex is too complex and compact.
I found a few problematic rulesets and I simplified them by diving the
very compact rule into two rules.  They should be compatible with both
Python and Javascript now. 

Please pull from:

git://gitorious.org/httpseverywhere-osamak/httpseverywhere-osamak.git

Regards,