Updated aliases, tweaking bash/zsh