Fixed git status parsing for git 1.8.5
Merge pull request #130 from pmcdaniel/fixGitStatusParsing

Fix "git status" parsing in prompt for git 1.8.5
Revert "Merge pull request #130 from pmcdaniel/fixGitStatusParsing"

This reverts commit cfd5d1bcd0cd93871ce174be4c709304f3bce28d, reversing
changes made to e28115a83335cbac70098f884d587973458782de.
Fix `res` for Mavericks (closes #116)
Merge remote-tracking branch 'upstream/master'