add rbenv and update configs
update emacs config
fix conflit