Building out test suites and integrating travis.
Merge branch 'master' into chef-11.4

Conflicts:
	test/environments/test-stack.json
Making env json consistent.
Merge branch 'master' into chef-11.4