Add testing gems
rubocop auto correct
Remove comments from vagrantfile
Fix strainer file for food critic
Add .rubycop.yml
fix rubocop warnings
Add readme notes for contributing/testing
Add smartos to kitchen
Be more clear about contributing merge policy
UIS-822: Bump kitchen yml.
Merge branch 'master' of https://github.com/livinginthepast/smf into UIS-822

Conflicts:
	.kitchen.yml
	Berksfile
	Vagrantfile
	libraries/xml_builder.rb
	metadata.rb
	resources/default.rb