minor updates of bashrc & hgrc
merging