back to 2.2.0; poke build towards envoronmental cues
Merge branch 'master' into gh-pages