"unalias" is already a bash builtin.  Changed it to "expand_alias".
Merge branch 'master' into fix_unalias