Fix failing ckeditor HTML5FragmentField tests.

The new HTML5FragmentField behavior is to require a set of elements, attributes, etc
on initialization -- no pre-set defaults.
Merge branch 'master' into django_14
Rename 'sapling' app to 'main'.

Testing out to see if this fixes an issue I'm having with deployment.  Right
now, installs have various localwiki-0.x.x-py2.6.egg modules installed, which
all have a 'sapling' module inside.  'import sapling' causes this sapling
module to be imported, rather than the new 'main' sapling module for 1.4.
By renaming 'sapling' to 'main' I hope to fix this and bring about a little
more sanity to the project layout.