Import normalize_rails and refills

Whoops, forgot to add these changes.