Merged in changes from master.

.gitignore

gracedb/api.py

gracedb/forms.py

gracedb/models.py

gracedb/reports.py

gracedb/urls.py

gracedb/urls_rest.py

gracedb/views.py

ligoauth/management/commands/refresh_users_from_ldap.py

manage.py

settings/fan.py

settingsdir/branson.py

settingsdir/default.py

templates/admin/base_site.html

templates/base.html

templates/gracedb/event_detail.html

templates/gracedb/event_detail_GRB.html

templates/gracedb/event_filelist.html

templates/gracedb/event_list.html

templates/gracedb/gstlalcbc_report.html