Version bump to 1.6.1-beta.
Don't load file with locate_template().  This won't allow the filters to be applied.
Set 'max-width' rather than 'width' so that captions work better with responsive design.
Version bump to 1.6.1.
Merge branch '1.6'