Merge branch 'master' of https://github.com/juliobetta/collective_intelligence
major refactoring
Merge branch 'refactor'