changed ls bash commands to print in color
removed savehist and saveplace files from repo
fix merge conflicts on .git-completion.bash, .gitignore, and the makefile