swtitch to gregbell's branch for active_admin