Maintaining an up-to-date development environment

I did most of the compatibility work already on the 3.1 push, so we are already all set on the 3.2 move and will be doing so soon.