fix require, use local modules
remove addMeta
test for travis
Merge branch 'master' into spm2