Misc additions
Added bashrc.local
Merged bashrc
Misc changes
Merges
Merge branch 'master' of github.com:jefflarkin/dotFiles