3.2 compatibility

Haven't extensively tested, but tests are passing on latest master. You'll need to decide on how to handle branching (a 2.0 branch for 3.1 compat?), and update the travis.yml and README accordingly.