Source code test: Fixing source code error

I found a lot of instances of 'rescue => e' in our code which triggered rubocop
since the e variable wasn't being used. I think it's better to just recommend
'rescue' since it's also the same thing as 'rescue StandardError'.
Merge pull request #2885 from daviddavis/temp/20130904123156

Source code test: Fixing source code error
Bastion: adding ability to remove systems.
Puppet: Limiting definitions to one puppet repo

Also breaking apart yum and puppet selectors
Merge pull request #2876 from waldenraines/delete-system

Bastion: adding ability to remove systems.
Puppet: Checking composite definitions for one puppet repo
Filters: Limiting rules to filter's content types
Merge pull request #2870 from daviddavis/puppet-repo-selector

Puppet: Limiting definitions to one puppet repo