Merge pull request #119 from mauritsvanrees/master

Fix branch option for earlier versions of git.
Remove `-d` switch to use setuptools instead of distribute now that they are merged and using the switch caused bootstrap to fail.
Update bootstrap for zc.buildout 2.x.
Upgrade setuptools before bootstrapping.
Prepare mr.developer 1.26.
Bump.
Fix error message when listing of git branches fails. Fixes issue #124
Fix encoding issues during installation if the default encoding isn't properly set. Fixes issue #127
Fix for Python < 2.6.