bashrc better prompt
Merge branch 'voci'