Fixed issue w/ factory girl.
Merged master