moving mac non server component from bashrc to bash_profile
adding bash_profile to repo only for backup; do not symlink it on rake install
resolving merge