better timeouts, better category logic
Merge branch 'master' of github.com:lmccart/fixus