Merge branch 'master' of https://github.com/chef-partners/knife-vcair into develop
Merge remote-tracking branch 'origin/develop' into vmworld-wrapup
Documented work for vmworld release.