caught master branch up on system files.
Merge branch 'master' of github.com:weverett/scripts into kraken
updated .bashrc
fixed merge