Removing deprecated options from server.cfg and client.cfg
Removing option from activemq.xml.erb that causes ActiveMQ to not start
Merge pull request #30 from hundredacres/master

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