This seems to be working pretty well right now.
Merge pull request #9 from GorillaApp/fix-span-on-entry

A couple changes to the way that editing works.