add puppet, remove dired+ (weirdness!);
web-mode, etc.
2 space indents...
haskell mode hooks
tweaks
changing structure
Merge branch 'develop'