Progress on the hobbitcon demo (code is a mess tho)
Merge pull request #252 from palantir/merge-demo-stuff

Progress on the hobbitcon demo (code is a mess tho)