add any elisp files in .emacs to repo
add README
remove cruft
fix conflict