added browse-kill-ring
moved epc into emacs dir
resolved merge conflict