Slightly cleaner organization
Merge branch 'master' of github.com:iguess/iguess