Changed type of hypsometry_file parameter to *file*.
Merge branch 'master' of https://github.com/csdms/wmt