Refactor .bashrc
Remove alias hack for vim