Merge pull request #37 from rjleveque/rjl

Changes to conversion script due to adding amrdata as a new attribute of rundata
Merge remote-tracking branch 'upstream/master' into rjl

* upstream/master: