added QUERY_STRING_ key and fixed line breaks to Unix style
Merge pull request #2 from mikeedwards/added_query_string

added QUERY_STRING_ key and fixed line breaks to Unix style
merge conflict with upstream
query string and url match support; fixed count support