Updates
Merge branch 'master' of https://github.com/paulgroves/thinginator

Conflicts:
	app/assets/javascripts/collections.js.coffee