initialContent is now wrapped in a <p> tag if we're using the default
Merge branch 'master' of http://github.com/punkave/apostrophe