+ Refactored ContextEntity to be based on Type only versus Type.Name
+ RockBlock now has ContextEntity<T> and ContextEntity method instead of making the blocks do the lookup logic