Updated bashrc with hg in prompt
Single function for prompt
Merge branch 'master' into comp