Adds git branch to prompt
Shortens prompt when directory is too long
Merge pull request #4 from benizi/prompt

Improves prompt a bit