Rails32 - Updating Travis to actually run against the 3.2 gemfile
and adding missing logging gem.
Rails32 - Fixing some unit tests that broke under Rails32.
Rails32 - Adding check for secure token and Rails 32.
Rails32 - Switching to be_json matcher for some tests.
Rails32 - Changes simple_crud_controller tests to turn data into json
using as_json similar to the controllers themselves.
Rails32 - Attempting to fix json error output.
Merge branch 'master', remote-tracking branch 'katello' into rails32-fixes
Rails32 - Adds conditionals to use a set BUNDLE_GEMFILE environment
variable or punt back to the basic Gemfile.  This is needed for
testing both stacks on Travis and in the future any separate Gemfiles.
Rails32 - Fixes glue layer tests that needed to reload EnvironmentProducts.
Rails32 - Updates use of ActiveSupport::Concern to remove deprecation
warnings around use of InstanceMethods.
Rails32 - Adding two calls to retrieve a content view version to
prevent an ActiveRecord:ReadOnly error from being thrown.
Rails32 - Adding password except to json output of compute resource.
removing dead code - ResourcePermissions
removing resource_permissions require and minor fix
Merge pull request #1771 from ehelms/rails32-fixes

Rails32 Fixes
Removing system template code
Merge pull request #1769 from daviddavis/rm_system_templates

Removing system templates
Content views: fixed double included
Merge pull request #1776 from daviddavis/cv_double_include

Content views: fixed double included
Merge pull request #1766 from lzap/resource-perm-removal

removing dead code - ResourcePermissions