convenience functions
no backup files
merge, commit, diff tools as functions
parameterized
* added history function
* clarified error messages and dependencies
renamed aliases