Merging in @mhz and @cscairns

Verified at http://18f.github.io/18f-staging/, current `devel` works great.