Hopefully last merge for 0.2.0

git-svn-id: https://plugins.svn.wordpress.org/only-one-category/trunk@757262 b8457f37-d9ea-0310-8a92-e5e31aec5664