[themes/josh] Use $(current_branch) in prompt
Merge pull request #1030 from solnic/master

[themes/josh] Use $(current_branch) in prompt