fixed bashrc for ubuntu
merged
added solarized terminal to ubuntu