Conditional OSX setup, moved Vim submodule