expand file names appropriately
add evil-surround as local package
drop marmalade
back to the old res