Merge pull request #9 from GorillaApp/fix-span-on-entry

A couple changes to the way that editing works.
Merge branch 'master' into fix-span-on-entry