Include aliases in bashrc

Hey @bryceallison could we merge this? I don't know where the .zsh stuff came from...maybe edits you made on one of my boxes?