Emacs - Consolidate init file, add fci mode