Rearrange bashrc
Remove unused xvimrc