Updating 2.0 with corrections from 1.0

[alexwilson]

No description provided.

[robfrawley]

@antoligy @lsmith77 Operations like this are much more appropriate as a CLI manual re-base than a PR/merge in the future, I would propose (IMHO).

Such avoids odd looking commit history like the duplication of commits and other oddities that may result (for example, see the commit duplicates on "Oct 30, 2016" on the 2.0 branch (that don't exist on 1.0) b/c of this PR. See https://github.com/liip/LiipImagineBundle/commits/2.0:

• robfrawley committed 5 days ago c8648ca correct accidental regression introduced in prior commit
• robfrawley committed 5 days ago 210922c correct example filter yml definitions in docs (fixes Scale filter not found / incorrect filter config documentation #818) and othe
• robfrawley committed 5 days ago 42bf661 correct accidental regression introduced in prior commit
• robfrawley committed 5 days ago c1364db correct example filter yml definitions in docs (fixes Scale filter not found / incorrect filter config documentation #818) and other

Notice the 1.0 branch only contains c1364db and 42bf661 as it should (and as should 2.0, but due to the oddities of GitHub graphical, auto-merge, it instead contains duplications)

[lsmith77]

I personally do not feel passionate about keeping the history clean at this level. it really has never really bitten me. but if you prefer I am fine to keep an eye on this in the future.