998001: Put the help message back in
Rubocop: fixed controllers except for API controllers
Travis: Running lint test first so it can fail fast
Nutupane: fix 500 on organization subscription controller results.
Removed remanants of test.rb from katello spec
Merge pull request #2850 from parthaa/spec-fc18

Removed remanants of test.rb from katello spec
Merge pull request #2847 from daviddavis/rubocop-controllers

Rubocop: Checking non-API controllers
Rubocop: Fixing a couple rules and turning them on
Merge pull request #2848 from daviddavis/temp/20130829161430

Travis: Running lint test first so it can fail fast
Quick fix to get katello building on F19
Merge pull request #2852 from parthaa/f19

Quick fix to get katello building on F19
Fix apidoc generation

Addressing 'undefined method `expected_type' for nil:NilClass'
Test ability to generate apipie doc from travis
Bastion: Adding products table view and creation screen.
Merge pull request #2849 from waldenraines/fix-subscriptions

Nutupane: fix 500 on organization subscription controller results.
Subscriptions: Passing the total_count directly from the ES search
to the panel render function.
Merge pull request #2851 from daviddavis/temp/20130829190519

Rubocop: Fixing a couple rules and turning them on
Merge pull request #2855 from ehelms/subscriptions-fix

Subscriptions: Passing the total_count directly from the ES search
Merge pull request #2846 from Katello/bkearney/998001

998001: Put the help message back in
Merge pull request #2853 from iNecas/apipie-fix-params

Fix apidoc generation