Merge branch 'master' of https://github.com/underhilllabs/scuttle

Benjamin Mako Hill || Want to submit a patch?