Some triming

Conflicts:
	.bashrc