added bash aliases file, changed mergetool cmd in gitconfig
Merge branch 'master' of github.com:/darren-trx/testing