added win-swap, eval-and-replace, and doremi to el-get packages
some not too important stuff
resolved merge conflicts with pull from origin/master
added C-c S: edit shell init file. Minor changes.
added tramp to .gitignore
removed melpa.el from my-packages.
changes before deleting everything.
fixed merge conflicts
added backup files to .gitignore