Move ENCODE2_AWARDS set to upgrade where it is used.
Split views.py into several files under types.
Merge branch 'master' into 1836-obi-synonyms
Added synonyms for OBI terms into index.