Merge branch 'master' of github.com:jfinken/dotfiles
rcp infra
cleanup
Merge branch 'master' of github.com:jfinken/dotfiles
post-clean
Merge branch 'master' of github.com:jfinken/dotfiles

Conflicts:
	bashrc