Pull request for all the remaining patches, including the new performance monitors.

On Thu, 2014-10-09 at 07:07 -0700, Jens Breitbart wrote:
> > +     // Overridde from the base class.
> > +     Configuration::configopts getConfigOpts() override;
> 
> Function can be qualified with const.

Fixed.