Added magit-inotify.
Fixed error in last commit.
Copied some settings from Emacs Prelude.