Merge pull request #26 from edx/dev

Dev
Merge pull request #27 from edx/dev

Commit to activate travis
Fix confidence generation
Merge remote-tracking branch 'origin/master'