applied patch to .bashrc that loads id_rsa with keychain if both exist
Merge branch 'dev'