Issue#34 content formats

This is a big update to the aloha module.  I manged to get it working as an inline editor with blocks.  You can still double click to go to the edit page.