simplify bad capture stuff
Merge branch 'master' of https://github.com/spencebeecher/echo