Fixed merge detritus
Merge branch 'master' of git://github.com/gbrindisi/combine into gbrindisi-master
Merge pull request #82 from gbrindisi/updated-grequests

New grequests version, added exception handler support to map()
Fixing requirements spec, it can't have the '/0.3.0' at the end
Added the exception handling to the local files as well (#78)
Merge pull request #83 from mlsecproject/gbrindisi-master

Logging + Updated grequests + exception handling (closes #78, closes #32, closes #34)
add waffle.io badge
Merge pull request #87 from waffle-iron/master

waffle.io Badge
Merged conflicts from upstream/master