Finally sorting out bootstrap and merging .bashrc from various machines