Changed vim and bash settings around