pass self into factory and invoke proc in that factory's scope.
add test for custom trait
Merge pull request #17 from jch/make-custom-traits

Make custom traits
Merge remote-tracking branch 'origin/master' into namespace-tests

Conflicts:
	test/builder/activerecord_test.rb