Merge branch 'refactor-ansible' of github.com:somerandomsequence/falling-fruit into refactor-ansible

Conflicts:
	util/medusa/provisioning/production
	util/medusa/provisioning/roles/ffweb/defaults/main.yml
	util/medusa/provisioning/roles/ffweb/tasks/main.yml
	util/medusa/provisioning/roles/pgpool/files/pgpool.conf
	util/medusa/provisioning/roles/postgres-postgis/defaults/main.yml
	util/medusa/provisioning/roles/postgres-postgis/tasks/main.yml
	util/medusa/provisioning/roles/postgres-postgis/templates/postgresql.conf.j2