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