Merge pull request #7466 from sebnash/autodmg

Update AutoDMG to v1.5.2
Merge pull request #7465 from Ihavee/shadowsocksx

Upgrade shadowsocksx to 2.4.1
Upgrade PyCharm to 4.0
Upgrade PyCharm Community Edition to 4.0
Upgrade Futuniuniu.app to v2.16.354, and linking the app with official Chinese name
Added Application-Support folder to zap method for Deezer
Updated CoqIDE to 8.4pl5; Changed protocol to https
Merge pull request #7472 from fharbe/coqide

Updated CoqIDE to 8.4pl5; Changed protocol to https
Add puppet
Added Puppetlabs Facter 2.3.0
Added Puppetlabs Hiera 1.3.4
Merge pull request #7469 from jalaziz/pycharm-updates

Upgrade to Pycharm 4.0
Merge pull request #7468 from fharbe/deezer

Added Application-Support folder to zap method for Deezer
Merge pull request #7453 from rolandwalker/no_gitx_search_test

avoid gitx in partial-match search tests
Merge pull request #7451 from rolandwalker/remove_nested_container

DSL: remove support for `nested_container`
Merge pull request #7450 from rolandwalker/remove_old_header_support

DSL Remove support for old-style header lines
vimr: Update to 0.3.0-21.
Merge pull request #7476 from fharbe/hiera

Added Puppetlabs Hiera 1.3.4
Merge pull request #7475 from fharbe/facter

Added Puppetlabs Facter 2.3.0
cut v0.48.0