No more cows.
Merge branch 'master' of github.com:aaronschif/bashrc

Conflicts:
	scripts/environ.sh