added ff alias, set cursor to change color when using gui emacs
fixed merge conflicts