add support for local.bashrc
merge changes from master