add tern
merge .emacs