almond from npm
Merge remote-tracking branch 'origin/rjs' into rjs