Merge branch 'uklans:master' into master

cache_domains.json

@@ -107,11 +107,6 @@
 			"description": "CDN for The Elder Scrolls Online",
 			"domain_files": ["teso.txt"]
 		},
-		{
-			"name": "twitch",
-			"description": "CDN for twitch games / mods and addons",
-			"domain_files": ["twitch.txt"]
-		},
 		{
 			"name": "warframe",
 			"description": "CDN for Warframe",

origin.txt

@@ -1,3 +1,2 @@
-# WARNING:  Origin has been seen downloading https client downloads on origin-a.akamaihd.net.  A solution should be in place to forward https to the origin server (eg sniproxy)
 origin-a.akamaihd.net
 lvlt.cdn.ea.com

sony.txt

@@ -1,2 +1,13 @@
 gs2.ww.prod.dl.playstation.net
 gs2.sonycoment.loris-e.llnwd.net
+pls.patch.station.sony.com
+*.gs2.ww.prod.dl.playstation.net
+*.gs2.sonycoment.loris-e.llnwd.net
+gs2-ww-prod.psn.akadns.net
+*.gs2-ww-prod.psn.akadns.net
+gs2.ww.prod.dl.playstation.net.edgesuite.net
+*.gs2.ww.prod.dl.playstation.net.edgesuite.net
+playstation4.sony.akadns.net
+theia.dl.playstation.net
+tmdb.np.dl.playstation.net
+gs-sec.ww.np.dl.playstation.net