Merge new code from upstream.
Merge pull request #59 from scraperwiki/merge-new-pyexcelerate

Merge new code from upstream.