bug fixes
fixed merge conflictts
changed nestcking to handle odd refinement
Merge remote-tracking branch 'mjberger/regions' into regions

* mjberger/regions:
  changed nestcking to handle odd refinement
  bug fixes