Fix deprecations.
Merge pull request #12 from steveklabnik/deprecations

Fix deprecations.