simplified factories and fixed greg for tests
fixed feature and unit specs
Merge branch 'master' of github.com:alexwilkinson/families