changes for 1.0 of Active Admin
Updates for 1.0, changes to resource_params method to avoid name clash
Fix for alternative delimiters
Merge pull request #4 from Papercloud/rails-4-active-admin-1.0

Changes for 1.0 of Active Admin