Comment out conflicting aliases.

Namely, pu and po. By the way add *~ to .gitignore
Merge branch 'commonCustomization' into personalCustomization
Move aliases to lib/aliases.zsh

Prevent templates/zshrc.zsh-template from being too large.