Remove 'name' from 'user' table
Ran rake db:migrate
Merge branch '63'