Travis/appveyor updates

Laura A DeCicco requested to merge ldecicco-USGS:master into master Feb 02, 2015