Merge pull request #19 from bobby-brennan/lucybot

A pull request from Lucy
Lucy commit
Merge branch 'master' of https://github.com/bobby-brennan/kaltura-test into lucybot