Add colorscheme
re-add bashrc
Merge branch 'master' of github.com:cyx/dotfiles