I almost never want to edit an entry directly from the page.
Revert "I almost never want to edit an entry directly from the page."

This reverts commit 0c3a536aaae948d234dd36981fc99dbdb508027d.
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme
Merge branch 'master' of git://github.com/tobinjt/ariane-theme