Merge pull request #139 from SirLazarus/master

Removal of FILE_DIR dependency and resolution of issue #111
Replaces references to Exodus with Hypatia
Merge pull request #2 from HypatiaStation/master

Update from upstream