collection stuff
Merge remote-tracking branch 'origin'

Conflicts:
	backbone.sm2.coffee
	backbone.sm2.js
	tests/index.html