adding OS checks in bashrc
more emacs merging