Merge develop onto master

We haven't used the master branch in ages. Develop is the de facto master branch, so how about we make it official?