Test proxy options.
Merge branch 'master' of github.com:tomas/needle
Merge branch 'master' of github.com:tomas/needle
Cleaned up the options.json part a bit.