Small fixes for working against current ActiveAdmin master branch - 1.0.0.pre including changes from @alepore's 'Fixes for AA 0.6.1'.