Changed directory to .emacs.d/config for storing config files.
Fixed merge