Merging unified observers branch.

Merging unified observers branch, which gets rid of the "Manager" class and unifies the EntityObserver hierarchy a bit.