added marmelade repo and update basic .emacs conf