Modified some stuff, need to sort out.
Merge branch 'master' of https://github.com/green0eggs/ConfigFiles

Conflicts:
	.bashrc