What political and social differences existed between the Puritan settlers of Massachussets Bay Colony, and the Brownist settlers of Plymouth? Did these cause strife when the two colonies were merged?