refactor and expand test suite
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	Gemfile