Remove .bash_local.
Merge branch 'master' into ahalife
Merge changes from master branch.
Update path to excludesfile in .gitconfig.