Some cleanup, add vim packages etc.