uvm updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc.d/70-uvm.bash
gitignore