Merge branch '122-urls-consistent-maken' into 'master'
Make url patterns more consistent Closes #122 This addresses nearly all changes from the proposed urls.csv. However, the changes to the password reset URLs have not been implemented. We currently include `django.contrib.auth.urls` for all URLs related to authentication, and changing those would require including all of the individual URLs instead. For maintainability, I suggest we maintain the `reset` pattern instead of the (arguably more clear) `reset-password`. See merge request !171