Changed aliases in bash_profile to match zshrc
Reorganized aliases for easier cherry-picking