Clean up bashrc: Use convention of _ for functions, - for commands. Various small cleanup.