Migration to chef11
Merge branch 'master' of github.com:spudnic/sdinc

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock