Made mods for home.
Merge branch 'master' of http://www.github.com/gabrielsjoberg/dotfiles

General mergy goodness and a few portability fixes.

Conflicts:
	bash/bashrc