Clear separation of development.ini and test.ini databases.
(cherry pick f69ef5d8bed82389d9c306fb8addaf52ede41984)

Conflicts:
	Vagrantfile
Added noserc to make ckan tests more readable.
Add scripts dir for my command-line scripts.
(Cherry-pick 00b7965ff14e03585526325ddbc6de775a763a33)

Conflicts:
	.gitignore
Fix the error you get on the first run of vagrant provision error, to do with Postgres role creation.
PostGIS tables ownership changed to allow "db clean"
Sort the data dirs for when running in paster - allows login. Port in site_url for tests. Githook for ckanext-dgu commits - does not work. Add pymollum, ckanext-importlib for scripts. Manual merge of bits from dev-master branch.
(Cherry-pick 0174634d07803eea4dfc098335c37da8f5aa0b78)

Conflicts:
	README.md
	puppet/modules/dgu_ckan/manifests/init.pp
	puppet/modules/dgu_ckan/templates/ckan.ini.erb
	src/git_clone_all.sh
Removed development.ini and its db. Now just use the ckan.ini and ckan db.
(Cherry-pick a822083fefe114f33e86436c29732e90e84f3d73)

Conflicts:
	puppet/modules/dgu_ckan/manifests/init.pp
Merge branch '2.0' of github.com:datagovuk/dgu-vagrant-puppet into 2.0
Tidy error from cherry-pick of vagrant file.