Let's see how it'll roll on Python 3.3.
Merge branch 'master' into 3.3.0
Sadly, but we are going to drop 2.5 support.
Reformat comments as I have my ruler at 100 chars now.
New version: 2.2.

- Add classifiers to setup.py.
- Drop Python 2.5 support.
- Add Python 3.3. support.
- Reformat comments to 100 chars word wrap.