Make master the main development branch again

I think we're finally at a point where the develop branch (2.x) is more stable than the old (1.x) master branch.