Bleeding edge -> master

Need CONTRIBUTING.  Approved by Pomf.