Pillow 2.0.0 supports Python 3 out-of-the-box so we can remove our workarounds.
Python 2.x can stay with any Pillow while Python 3 requires at least 2.0.0
Merge branch 'master' of https://github.com/ralsina/nikola into pillow
Merge pull request #393 from okin/pillow

Pillow 2.0.0 supports Python 3 out-of-the-box so we can remove our workarounds.