Made branch and venv two lines.

Includes a fix for `git branch | grep ^*` returning
"* (no branch)" by using cut instead of awk, and grabbing all but the
first column.