removed factory_girl: not compatible with rails 4.x
configured factory_girl, Person 'can make a factory person': G
ruby 2.1.0 now enforced somewhat
Merge branch 'dev'

Conflicts:
	Gemfile
	Gemfile.lock