removed some cruft
fixed conflict in devise reg newhtmlerb