[NetNow.co] Update and merge rulesets (EFForg#11458)

* [NetNow.co] Remove exclusion

* Delete NetNow.co-falsemixed.xml

* [NetNow.co] Add comment before rule

* [NetNow.co]

src/chrome/content/rules/NetNow.co.xml

@@ -1,50 +1,20 @@
 <!--
-	For rules causing false/broken MCB, see NetNow.co-falsemixed.xml.
-
-
-	Insecure cookies are set for these hosts:
-
-		- netnow.co
-		- www.netnow.co
-
-
 	Mixed content:
+		www.netnow.co (css,js and img from ^)
 
-		- css from $self *
-		- fonts from $self *
-		- Images from $self *
-
-	* Secured by us
-
+	Invalid certificate:
+		asi.netnow.co
 -->
-<ruleset name="NetNow.co (partial)">
+<ruleset name="NetNow.co">
 
-	<!--	Direct rewrites:
-				-->
 	<target host="netnow.co" />
 	<target host="www.netnow.co" />
 
-		<!--	Avoid broken MCB:
-					-->
-		<exclusion pattern="^http://(?:www\.)?netnow\.co/+(?!favicon\.ico|wp-content/|wp-login\.php)" />
-
-			<!--	+ve:
-					-->
-			<test url="http://netnow.co/apps/" />
-			<test url="http://netnow.co/blog/" />
-			<test url="http://netnow.co/contact-netnow/" />
-			<test url="http://www.netnow.co/support/" />
-
-			<!--	-ve:
-					-->
-			<test url="http://netnow.co/wp-login.php" />
-			<test url="http://www.netnow.co/wp-content/plugins/usernoise/images/ok.png" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^(www\.)?netnow\.co$" name="^X-Mapping-[a-z]{8}$" /-->
+	<securecookie host=".+" name=".+" />
 
+	<!-- Avoid mixed content -->
+	<rule from="^http://www\.netnow\.co/"
+		to="https://netnow.co/" />
 
 	<rule from="^http:"
 		to="https:" />