Merge pull request dronekit#575 from dronekit/rroche/version_2.2.0

bump release to 2.2.0

Merge pull request dronekit#557 from dronekit/release_branch_2_1_0_up…

…date

Update setup.py and doc.conf to release 2.1.0