Cleaning .profile
Add zsh PROMPT handling
Merge remote-tracking branch 'origin/master'

into a topic branch.