added submodules; edited bashrc on mac