Add timeout and retries
Add commented query tests with unit
Better error checking, spider refactored
Merge branch 'master' of github.com:FFM/FFM