Added context aware aliases .B and .R more to come
Fixed merge conflict with .zshrc