This fixes a host of bugs introduced by depending on AMRClaw.
Merge pull request #53 from ketch/fix-amrclaw-dependence-bug

This fixes a host of bugs introduced by depending on AMRClaw.