Merge remote-tracking branch 'origin/master' into gemlock_update
Move faker into test group
Merge pull request #6 from alexung/faker_to_test

Faker to test