Update managed dotfiles
Add Haskell Platform's executables path
Add Haskell plugins
folding
Add git-files-conflict