Cleanup bashrc, move aliases together