Several changes to vimrc bashrc and setup