Merge pull request #896 from sylus/feature-wet-v3.1

Ember is a theme not a module
Add tao + rubik back till ember is ready.

Signed-off-by: Will <sylus1984@gmail.com>