Merge pull request #30 from hundredacres/master

Remove deprecated mcollective config options / Remove attribute from activemq.xml file