Improved handling of tag and branch names in prompt.
Updated readme.
Merged changes from upstream.