Bump version up to 2.2

Version 2.1.1 was never released (due to travis build errors)
so we can remove it from being a version number and go directly
to 2.2 (and collapse the CHANGES.rst to account for that).

Author: Joshua Harlow

CHANGES.rst

@@ -1,32 +1,24 @@
 Changelog
 =========
 
-2.2 (unreleased)
-----------------
-
-Features
-********
-
--  Issue #234: Add support for reconfig cluster membership operation
-
-Bug Handling
-************
+2.2
+---
 
 Documentation
 *************
 
-2.1.1
------
-
 Features
 ********
 
+-  Issue #234: Add support for reconfig cluster membership operation
+
 Bug Handling
 ************
 
 - #315: multiple acquires of a kazoo lock using the lock recipe would
   block when using `acquire` even when non-blocking is specified (only
   when the lock was/has been already acquired).
+- #318: At exit register takes *args and **kwargs not args and kargs
 
 Documentation
 *************

setup.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.1'
+__version__ = '2.2'
 
 import os
 import sys