Rearranged and updated vim file
Fixed modeline