update rc
Merge branch 'master' of https://github.com/cfitz/dotfiles

Conflicts:
	home/.bashrc