Cherry-pick from devel; tomcat version, fixes and ferret urls
Merge pull request #34 from ESGF/devel

1.7.0-phoenix-release-master
Merge pull request #36 from ESGF/devel

Fixes issue 35
Merge pull request #37 from ESGF/devel

CDAT tagname was not compatible with check_version
Updating Tomcat Version to 7.0.54
merge from devel
1.7.1