import shell_aliases.local
Merge branch 'master' into bepo