Various changes to make vim work in Windows and Linux without pain