Update Haskell makefile template
Clean up dropbox script
Add vim enmasse
Use system xmonad again
Use system GHC
Merge branch 'master' into grapefruit