Beginning merge of .bashrc