added user count to rake task
updated faker-stoked
fixed merge conflict
fixed diff in Gemfile.lock
fixed dif in Gemfile.lock
fixed conflict in Gemfile
removed redundant subtasks from populate command
working on vineyard vintages