Merge pull request #197 from havvg/master

add documentation on S3 object URL options
Merge pull request #198 from havvg/master

add docs about allow_scale of thumbnail filter