Some bashrc, gitignore changes
Merge branch 'master' of github.com:dshrader38/dot-files