grepcode.sh - don't grep through test/base or test/out files
Added git-ls-merge-tree.sh to show the merge tree nicely
Merge branch 'master' of https://github.com/bcowgill/bsac-linux-cfg
updated from home versions