Don't delete the database on reprovision.
Merge branch 'master' of github.com:liip/ckan-vagrant

Conflicts:
	cookbooks/vagrant/recipes/default.rb