move alias defs out of copy to bash_local section
Merge remote-tracking branch 'origin/master'