[X][ZSH] Merged with master. Add docker aliases