Consolidate code a bit
Remove dead code
Consolidate code, remove unused functions
Merge branch 'master' of github.com:iguess/iguess