Inlined two private variables in order to push toward more natural object instantiation.

Once rooms and currentRoomId are moved to a sub-object that just tracks game objects and offers contextual lookups, we can make this an object literal instead.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/adventure.js