Merge pull request #2 from cmr/master

merge master
stub out next week

So we can build it incrementally over the week. 

See a new RFC or interesting thread? Add it.
"Move" file to drafts. Also make drafts.
THIS IS UNECCESARILLY COMPLICATED TO DO ON GITHUB
Merge pull request #3 from Gankro/master

stub out next week