Initial DISCO commit.
Merge local.

Merge branch 'master' of https://github.com/chrismattmann/disco