Fixing typo with braces in the rewrite section.
Merge pull request #700 from chrisbaldauf/master

Fixing typo with braces in the rewrite section of the markdown file
order proxy_set option so it doesn't change between runs
Merge pull request #701 from oxilion/proxyset_sortorder

order proxy_set option so it doesn't change between runs
Merge remote-tracking branch 'upstream/master'