Revert "Revert 3f5c8ea..76d0f6f"

This reverts commit 0d7e0f86efb1d24c9c982760d21c62124eecda8a.
Revert "Revert "Merge branch 'fishAgent' of https://github.com/dhpollock/fwf into fishAgent""

This reverts commit 76d0f6f942f77a131f960cdd12ff84193b86547e.
wtf