Add better vim file handling