changes to work with the "thin-ress" branch of mojito
updated for latest Mojito RS
Merge branch 'master' into thin-ress

Conflicts:
	addons/rs/shaker.server.js
more careful about matching resources to contexts
Merge pull request #43 from drewfish/thin-ress

update to work with optimizations in mojito@0.5.0