Test ability to generate apipie doc from travis
Rubocop: Fixing the API controllers
Merge pull request #2854 from iNecas/travis-apipie

Test ability to generate apipie doc from travis
Merge pull request #2863 from daviddavis/temp/20130831182736

Rubocop: Fixing the API controllers