Merge pull request #22 from Harvard-University-iCommons/feature/email_settings

Added email settings used by django-canvas-course-wizard to send email n...
updated qa.txt to pull django-canvas-course-site-wizard from develop
rolled back change to qa.txt
updated qa.py to use qa icommonsapi
rolled back pointing to QA version of icommons api at https://qa.isites.harvard.edu/services/ to prod version https://isites.harvard.edu/services/. The amazon machines cannot connect to qa.isites.harvard.edu (ICD4).
temporarily points QA to pick up /develop branch versions of icommons-common and the course site wizard
Merge branch 'develop' into feature/email_settings

# By Eric Parker (4) and Yates, Elliott (1)
# Via Yates, Elliott (1) and sapnamysore (1)
* develop:
  temporarily points QA to pick up /develop branch versions of icommons-common and the course site wizard
  rolled back pointing to QA version of icommons api at https://qa.isites.harvard.edu/services/ to prod version https://isites.harvard.edu/services/. The amazon machines cannot connect to qa.isites.harvard.edu (ICD4).
  updated qa.py to use qa icommonsapi
  rolled back change to qa.txt
  updated qa.txt to pull django-canvas-course-site-wizard from develop