Cleanup some monkey patching.

apps/amo/__init__.py

@@ -143,9 +143,3 @@ else:
     COMPAT = {}
     NIGHTLY_VERSION = '17.0'
     DEFAULT_MINVER = '13.0'
-
-
-# We need to import waffle here to avoid a circular import with jingo which
-# loads all INSTALLED_APPS looking for helpers.py files, but some of those apps
-# import jingo.
-import waffle

lib/urls_base.py

@@ -20,6 +20,11 @@ handler404 = 'amo.views.handler404'
 handler500 = 'amo.views.handler500'
 
 
+# Hardcore monkeypatching action.
+import jingo.monkey
+jingo.monkey.patch()
+
+
 urlpatterns = patterns('',
     # Discovery pane is first for undetectable efficiency wins.
     ('^discovery/', include('discovery.urls')),

manage.py

@@ -84,10 +84,6 @@ trans_log = logging.getLogger('z.trans')
 #imported before anything else imports waffle.
 import amo
 
-# Hardcore monkeypatching action.
-import jingo.monkey
-jingo.monkey.patch()
-
 def new(self, arg):
     try:
         return mod(self, arg)