minor fixes
include almond in r.js optimization