mutt: reformat macros for readability
vim: use maintained version of ctrlp