add thorfile and update contributing
Merge branch 'master' of https://github.com/rackspace-cookbooks/contributing

Conflicts:
	CONTRIBUTING.md