Just have one master branch

It seems like we're over thinking this by having two branches. When we're ready to release, we'll just tag it.