updates, current laptop, ros includes
Merge branch 'master' of https://github.com/andrewm3/dotfiles

Conflicts:
	Xresources
	bashrc
	vimrc
	xinitrc