slightly changed requirejs config paths
Merge branch 'master' into gh-pages
updated