Merge branch 'master' of github.com:CouchPotato/CouchPotato

Conflicts:
	couchpotato/core/plugins/searcher/__init__.py

couchpotato/core/plugins/base.py

@@ -8,7 +8,7 @@ import os.path
 import re
 
 
-class Plugin():
+class Plugin(object):
 
     def conf(self, attr, default = None):
         return Env.setting(attr, self.getName().lower(), default = default)
@@ -39,4 +39,4 @@ class Plugin():
         return not self.isEnabled()
 
     def isEnabled(self):
-        return self.conf('enabled')
+        return self.conf('enabled') or self.conf('enabled') == None