Merge pull request #1338 from imalberto/search-next

Introduce a backward compatibility change for mix and match middleware with Mojito. Unit tests included.
Add more test coverage to lib/mojito
Merge branch next of git://github.com/yahoo/mojito into search-next