adds factory girl
Merge branch 'master' of github.com:tyne/tyne-dev