first pass
Merge remote-tracking branch 'origin/master' into github382
add avalontools testing to the travis script
Merge branch 'master' into github382