remove marmalade, rename some things, etc.
junk because who uses vim?