Updates to match new branch structure

  * After merging develop with big-refactoring-2012, rename the terms used in
    the webpage to match the new branch layout

  * Add documentation on cloudtm-2.2

  * Add a post about the forthcoming release 2.1, which fully integrates all
    the features from 1.x