Tidy up and version bump for release to WP.org