Updated the travis badge
Merge remote-tracking branch 'origin/2.1'
Updated docs for 2.2