Update to 2.1

and make tests pass, disable test that were testing unimplemented features

I got tired of all the branching - hope that you'd like to have a 2.1 branch in your code?