removing global Class export, conflicts with moo (duh)
Merge branch 'master' into gh-pages