Merge pull request #10 from francisco/master

Looks good to me.
Adding additional event tests and tests for twilio controller.
Fixed wordnik recursion.
Merge pull request #11 from sarlaf/working

Removed shit that broke wordnik - DOPE
AJAX request fixes