added cdl function (change directory and list contents), and added --no-commit to git merge aliases (always diff before you commit, ever auto-merge)