Merge pull request #250 from DylanLacey/master

Handle incorrectly escaped JSON for proxy strings.
Preparing for version 3.4.7
Stop hooks from over-writing new hooks