consolidated user normalization rake tasks
fixed nesting issues