Merge branch 'master' into quizzes

diff --combined karmaworld/settings/common.py
index ba72913d57c4f57ce79f1616278e86641a3444cc,440dd2af95ff50848ee67638e2f0d228c3926652..ccc410c0adc4e14b07f1b60ed9a0b71e970a37b6
--- 1/karmaworld/settings/common.py
--- 2/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@@ -242,9 -242,6 +242,9 @@@ THIRD_PARTY_APPS = 
      'allauth.socialaccount.providers.facebook',
      'allauth.socialaccount.providers.google',
      'allauth.socialaccount.providers.twitter',
 +
 +    # Added to make quizzes moderation nicer
 +    'nested_inlines',
  )
  
  LOCAL_APPS = (
@@@ -255,7 -252,6 +255,7 @@@
      'karmaworld.apps.users',
      'karmaworld.apps.moderation',
      'karmaworld.apps.licenses',
 +    'karmaworld.apps.quizzes',
  )
  
  # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@@ -375,7 -371,15 +375,15 @@@ TAGGIT_STOPWORDS = [u'a', u'an', u'and'
  
  ########## END TAGGIT CONFIGURATION
  
+ 
+ ########## HONEYPOT CONFIGURATION
+ # parts of this code borrow from
+ # https://github.com/sunlightlabs/django-honeypot
+ HONEYPOT_FIELD_NAME = "instruction_url" # see that "_url"? bots gotta want that.
+ HONEYPOT_VALUE = ""
+ ########## END HONEYPOT CONFIGURATION
+ 
+ 
  ########## TESTING CONFIGURATION
  TESTING = 'test' in sys.argv
  ########## END TESTING CONFIGURATION
-