Fix so that use destination port even when matching on source address.
Allow for CIDRs that match all addresses.
Tweak CIDR fix for readability.
More readability fixes
Merge pull request #42 from Metaswitch/plw

Two bug fixes