Move ENCODE2_AWARDS set to upgrade where it is used.
Split views.py into several files under types.
Merge 'origin/master'

Conflicts:
	src/encoded/views/views.py