Clean up of bashrc files, and changing how specs get run from vim.
Fixed a merge conflict