Improved .bashrc to handle X11 forwarding
Merge branch 'master' of https://github.com/lelandbatey/configDebDev

Conflicts:
	.bashrc