Merge develop back

I updated the wiki. 

Without a lot of discipline from us (that we don't have) edits to our docs--which will mostly be done on the web, here--will be made to the `master` branch. That seems natural to me--after all it's where I've been giving links out to--, and not dangerous (at this point) in the same way that code edits can be. But locally, we should be keeping our default branch as `develop`. These goals are going to collide.

What's the right solution?
I'm not committing this until someone gives me an answer.