Fixed the preferences scope of xblock.

(I messed up my last pull request, so I just cherry-picked the relevant commit onto a fresh branch of master.)

Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst