git merge additions, virtualenv, and brew install.