git and bash updates

Use meld as diff tool, and source any local bash scripts in bashrc
Merge branch 'master' of https://github.com/moonlite/.config