Modified some of the osx defaults script, removed macvim alias, added submodule aliases for git