add some syntax highlighting
Template the run-puppet-master concat fragment

This allows for the definition of the puppet confdir and vardir values
in the Puppet 3.x run fragment.
Remove config.ru notification to Nginx::Vhost

The Nginx virtual host should not care about the config.ru file, this
file is only relevant to the Rack compatible server being used, either
Thin or Unicorn. So we subscribe to the config.ru Concat resource in
both the thin::app and unicorn::app resources.
Merge pull request #70 from geoffgarside/template-config.ru

Template the run-puppet-master concat fragment
Merge pull request #71 from geoffgarside/config.ru-notify

Remove config.ru notification to Nginx::Vhost
Merge pull request #67 from puppetlabs-operations/colors

add some syntax highlighting
Merge branch 'master' of github.com:puppetlabs-operations/puppet-puppet
Send all graphite metrics in one payload.

Should minimize the overhead of establishing a new TCP socket for each
metric being sent.

References puppetlabs-operations/puppet-puppet#62
Merge pull request #72 from geoffgarside/issue-62

Send all graphite metrics in one payload.
Merge branch 'master' of github.com:puppetlabs-operations/puppet-puppet
>
>
> On Fri, Mar 14, 2014 at 9:28 AM, Cody Herriges <cody@puppetlabs.com> wrote:
>
> > Matthew Kirby wrote:
> > > Removing it would cause several failures I see to be resolved. I also
> > agree it should be removed. PE 3.2 will give us mcollective anyway.
> > >
> > > - Matt Kirby
> > >
> > >> On Mar 13, 2014, at 9:23 PM, Derrick Dymock <derrick@puppetlabs.com>
> > wrote:
> > >>
> > >>> On Thu, Mar 13, 2014 at 08:16:52PM -0700, Cody Herriges wrote:
> > >>> I believe the current MCollective module which we still deploy but has
> > >>> long been non-functional should be removed from our repository and the
> > >>> packages purged across the environment.  When we choose to redeploy we
> > >>> should evaluate the module, apply fixes, and start over.  I believe the
> > >>> module is now causing harm to Debian machines that will make
> > MCollective
> > >>> harder to make function again and may continue to cause unknown
> > degradation.
> > >>>
> > >>> For example:
> > >>>
> > >>> lrwxrwxrwx  1 root root   32 Mar 11 17:56 mcollective.rb ->
> > >>> /usr/lib/ruby/1.8/mcollective.rb
> > >>>
> > >>> root@puppet-pb1-prod:~# ls /usr/lib/ruby/1.8/mcollective.rb
> > >>> ls: cannot access /usr/lib/ruby/1.8/mcollective.rb: No such file or
> > >>> directory
> > >>>
> > >>> Thoughts?
> > >>>
> > >>> --
> > >>> Cody Herriges
> > >>> pgp key: 0x5DB77142 @ pgp.mit.edu
> > >> I vote to remove it, it just usually ends up causing some puppet runs to
> > >> fail and we don't even use mcollective currently.
> >
> > I started a branch last night that removes all references to the module.
> >  We just need to decide how to remove it the packages...Just purge the
> > them using Puppet or if you're up for something more poetic; remove it
> > with Pegasus.
> >
> > --
> > Cody Herriges
> > pgp key: 0x5DB77142 @ pgp.mit.edu
> >
> >