Pre-SaltConf changes
Pre-SaltConf patches.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Changes to the proxy minion, add release notes, remove REST server (move to separate repo)
Fix release notes.
Merge pull request #10179 from saltstack/proxy_20140204

Proxy 20140204, fix conflicts and rebase.