Updating the emacs mode to incorporate the grammar changes.  Also,
including two minor hacks to make indentation slightly less deep: when
a variable is assigned an object literal, or when an object literal's
field is itself an object literal, these don't cause an extra level of
indentation.  This is a minor hack, and can be removed if desired.