clean up

Nevermind, apparently I got on a computer before you did :-)

fixed data directory

Cvl2branch

cvl2branch

messed up default user in dynamicInventory

allow the heat template to specify an ansible_host_groups list instead o...

role to add the cvl menus to gnome2

forgot to add a role to git

cvlm2_slurm

dynamic inventories and fixes for other roles

Conflicts:
	roles/nfs-client/tasks/mountFileSystem.yml
	roles/slurm/tasks/main.yml