Instances are now a hash.
Merge branch 'master' of github.com:ourtownrentals/chef-phpmyadmin

Conflicts:
	recipes/default.rb