Merge pull request NCAR#1614 from NCAR/ejh_prepare

changed version numbers for 2.5.0 release

moved tag

Merge pull request NCAR#1495 from NCAR/ejh_release

update version numbers

updating version info for new release

fix build issues

improve build

correct issues in Makefile

Merge pull request NCAR#1357 from NCAR/ejh_fix_codacy_3

trying cmake build in travis

branch for pio1_7 with source update and old build

add missing include file