fix indentation of "other guidelines" (commented out api terms)
Merge branch 'master' into terms

* master:
  remove node modules from git
  add dependencies to package.json
  Clarify label for student associations
  Better label for relation-fieldsets
  Très bien!
  Add Emmanuelle pic
  Remove django-session-csrf.
  Add emmanuelle bio (needs pic)
  Use dummy cache in local dev by default.
  If Redis is not available on Heroku, run Celery tasks eagerly.
Merge pull request #65 from oddbird/terms

Terms