Force thumb image to be a 200x200 square
Merge branch 'index-views-more'

Conflicts:
	app/models/image.rb