* freebsd bash-completion
Merge branch 'master' of github.com:eddyxu/dotfiles

Conflicts:
	_bashrc