Prep for 2.2.1 release

git-svn-id: https://plugins.svn.wordpress.org/naytev-integegration/trunk@988463 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge for 2.2.1 release

git-svn-id: https://plugins.svn.wordpress.org/naytev-integegration/trunk@988464 b8457f37-d9ea-0310-8a92-e5e31aec5664