Fixing hydromap performance and correctness
Adding Bill's fix for the discharge file
Moving files to their correct location
Merge pull request #80 from eparsons/master

Adding Bill's changes for discharge file fix