update 15000 user records to include name, etc, create new dumpfile, add rudimentary user profile functionality, move more of the header code into application.html.erb
resolve minor merge conflict