Fixing hydromap performance and correctness
Move configuration to model.
Fix discharge file reading:
 - No newline needed at end of file.
 - Clamps files between 10k and 100k.
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
Fix merge from master
Merge branch 'master' of https://github.com/billbindi/USGS2012