Go back to habtm

 * Originally dependent_restrict had a raild4 habtm issue
   No longer an issue so can revert
 * This avoids the ugly deprecation:
   "DEPRECATION WARNING: You're trying to create an attribute
    `[:right_id, :role_id]'. Writing arbitrary attributes on a
    model is deprecated. Please just use `attr_writer` etc."
Add test dependency