merged bashrc and bash_aliases, removed some old commands and added some
new aliases