bashrc: added some more aliases and tidy