require modular scale in vars file
Merge branch 'master' into modular