Conflicts:
	spec/controllers/aspects_controller_spec.rb

Conflicts:
	spec/models/aspect_spec.rb

Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.

This reverts commit 570d0cf1, reversing
changes made to 9da53994.