Adds marmalade and tweaks whitespace-mode.