Disco

These are some of the changes used in the Disco fork of folsomite that I thought might be useful to be merged to upstream.