updates
Merge branch 'master' of https://github.com/slowbot/rebar

Conflicts:
	source/partials/_artwork-item.erb