Changes before pulling the proper update.
Merge branch 'master' of git@github.com:green0eggs/ConfigFiles

Conflicts:

	dot.bashrc