.emacs update
Fixed accidentally committed merge conflicts in restyle.rb