merge branch 'master' into devel
merge branch 'devel' of github.com:quintusdias/pyhdfeos into devel
blah