Merge pull request #167 from dbetebenner/master

Update to Adam's branch and adding in additional HI variable name lookups