Pulling it all to master

It occurred to me that in this project, I really don't need a develop branch.