Bug 1033475 - Allow user to configure email preferences from their profile

Update User Profile edit screen to allow email preference
Update text on account creation screen to indicate how to remove consent to email
Don't send email address in feedback email if they have not consented
Hide user email from most admin screens if they have not consented to receive email
Add consent_to_email field to UserProfile
Change OneAndDoneUserManager.get_query_set() to from select_related to prefetch_related due to https://code.djangoproject.com/ticket/15040

Should secure Auth - User admin to superusers only so that not everyone can see all the email addresses

Post review: Reduce length of very long string in SignUpForm
Merge pull request #171 from bobsilverberg/email_prefs

Bug 1033475 - Allow user to configure email preferences from their profile
Update django-browserid to v0.10.1 in vendor-local
Changes required to support django-browserid 0.10.1
Remove unused six.py from vendor-local
Merge pull request #173 from bobsilverberg/update_browserid_0.10.1

Bug 1007337 - Update OneAndDone to use django-browserid 0.10.1
Bug 1054031 - Update feedback text to include mention of profile email preference
Merge pull request #175 from bobsilverberg/feedback_text

Bug 1054031 - Update feedback text to include mention of profile email preference
Fix problem where a task attempt was trying to be retrieved for a non logged-in user
Merge pull request #172 from bobsilverberg/fix-feedback

Fix problem where a task attempt was trying to be retrieved for a non logged-in user
Bug 1032312 - Switch order of buttons on task detail page
Bug 1030976 - Add ability to prioritize task
Add Travis-CI
Merge pull request #174 from glogiotatidis/travis

Travis-CI
Add compiled.txt
Merge pull request #178 from glogiotatidis/travis-2

Add compiled.txt
Merge pull request #176 from bobsilverberg/priority

Bug 1030976 - Add ability to prioritize task
Bug 1032694 - Elements misaligned on new task creation page
Merge pull request #180 from bobsilverberg/task_form_style

Bug 1032694 - Elements misaligned on new task creation page
Bug 1044168 - Text: change "Easy" to "Beginner" for task difficulty