Update infrastructure
Version & changelog
Merge pull request #278 from arsduo/update_infrastructure

Update infrastructure
Merge branch '2.0.0' into test-suite-refactor

Conflicts:
	spec/spec_helper.rb