Add vim sneak and fix osxDefaults
Tidying up
Merge