release v2.2
merge in SartMatt's additions

git-svn-id: https://plugins.svn.wordpress.org/expandcollapse-funk/trunk@920042 b8457f37-d9ea-0310-8a92-e5e31aec5664