feature matrix
Merge branch 'master' of https://github.com/gmdayley/rethinku