Update to current master

Probably good to keep github repos sync'd to upstream, since people are likely to build on top of these.