updated
Merge branch 'master' of https://github.com/forkch/dotfiles

Conflicts:
	bashrc