added new eshell functions file and added a couple things to .emacs
fixed a merge conflict in bash_functions