ls and tmux aliases
Merged alias changes