got contenteditable working nicely
Merge branch 'chris'