Changed aliases and add commented ff and ci for merges.
Updated .emacs.d