Move puppet::proxy::base and puppet::proxy to generic_tmpl
Merge pull request #66 from mcanevet/move_puppet_proxy_to_generic_tmpl

Move puppet::proxy::base and puppet::proxy to generic_tmpl