Production code in master?

@ptdang
I was thinking what Watson said the other day: "production code should always be on master branch."  I think we should switch to "master" branch for this.