checkpoint
removed activeadmin
spec tweaks
merged in master