adding factory girl and fixing relationships :P