add saltstack
Merge branch 'amanda' into davy

Conflicts:
	openstack platform/readme.txt
merge