updated CRAN version to 2.1.1 dev version 2.2.0
Merge branch 'master' of github.com:trinker/trinker.github.com