Steal from Ben

* Bump up history
* Add useful edit-file mappings
* Simplify Rename (originally from Gary)