fix space issues

Conflicts:
	.bashrc
git log change