Merge pull request #16 from rjleveque/rjl

merged in Kyles changes to amrdata and modified some things