first pass
Fixes #389
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into github382
add avalontools testing to the travis script
Fixes #390
add a color for I
Merge branch 'master' into github382