+Naval: Adding factory boy to pip requires
modified .gitignore for vagrant
updating fredconsumer
Merge remote-tracking branch 'origin/master' into fredconsumer