Happy New Year 2014
Merge branch '0.10-maintenance'
Added a favicon for the docs
Merge pull request #943 from skeuomorf/favicon

Added a favicon for the docs
Release as universal python wheel (2/3 compat)
Merge pull request #947 from Ivoz/master

Release as universal python wheel (2/3 compat)
Remove the extra "1"
Added a workaround for a pypy bug in context managers
Make Python 3 happy
Fixed a missing import
Merge pull request #961 from GCorbel/patch-1

Remove the extra "1"