syncing against git repo; lots of progressive changes that look big here, but everything is still compatible with the previous version

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