About to add almond
Merge branch 'improve-requirejs'