Updated trunk with code for 0.4.0

git-svn-id: https://plugins.svn.wordpress.org/relogo/trunk@806936 b8457f37-d9ea-0310-8a92-e5e31aec5664