remove phase and refactor motion close_at

fixes #569

Conflicts:

	spec/models/user_spec.rb

update schema