diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml
index c5299982e182f3d749e5e9a6a3ad47c2c9442280..457df579952b83e5dd9bf13fc038ba24a40aa652 100644
--- a/roles/easy-rsa-certificate/tasks/buildCert.yml
+++ b/roles/easy-rsa-certificate/tasks/buildCert.yml
@@ -33,8 +33,12 @@
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   shell: rm -rf /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.*
+<<<<<<< HEAD
   when: cert is defined and cert.stat.size == 0
   sudo: true
+=======
+  when: cert.stat.exists == true and cert.stat.size == 0
+>>>>>>> fa3117e79a9bbcf686a4172081fa582f5d04d0d8
 
 - name: "set needcert if cert doesn't match key"
   set_fact: needcert=True
diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index beafee75dae26a9495bdacb36ff380ec2318074a..86a3d6d59968e0a386c2eeb0e2a73585cf321e1f 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/roles/slurm-build/tasks/main.yml
@@ -26,7 +26,7 @@
     creates: /root/rpmbuild/RPMS/x86_64/munge-{{ munge_version }}-1.el6.x86_64.rpm
 
 - name: get slurm
-  shell: wget http://www.schedmd.com/download/latest/slurm-{{ slurm_version }}.tar.bz2
+  shell: wget http://www.schedmd.com/download/archive/slurm-{{ slurm_version }}.tar.bz2
   args:
     chdir: /tmp
     creates: /tmp/slurm-{{ slurm_version }}.tar.bz2
diff --git a/roles/syncExports/templates/exports.j2 b/roles/syncExports/templates/exports.j2
index 2947a357f0044a0d84c9d3c1a47d946b092bb074..fee924eea707aedd046aaebfc68bd48b61bb92eb 100644
--- a/roles/syncExports/templates/exports.j2
+++ b/roles/syncExports/templates/exports.j2
@@ -1,4 +1,11 @@
-{% for export in exportList %}
-{{ export.src }} {% for group in groupList %}{% for node in groups[group.name] %}{{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}({{ export.srvopts }}) {% endfor %}{% endfor %}
-
+{% set iplist = [] %}
+{% for group in groupList %}
+{% for node in groups[group.name] %}
+{% if hostvars[node]['ansible_'+group.interface] is defined %}
+{% if iplist.append(hostvars[node]['ansible_'+group.interface]['ipv4']['address']) %}
+{% endif %}
+{% endif %}
+{% endfor %}
 {% endfor %}
+
+{{ export.src }} {% for ip in iplist|unique %}{{ ip }}{{ export.srvopts }} {% endfor %}
diff --git a/roles/vncserver/tasks/main.yml b/roles/vncserver/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b4df6889cdd83c26b50f59f044a849bc2e82c8da
--- /dev/null
+++ b/roles/vncserver/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+- include_vars: "{{ hostvars[ansible_hostname]['ansible_distribution'] }}_{{ ansible_architecture }}.yml"
+
+- name: add repos apt
+  shell: "add-apt-repository -y 'deb {{ item }} {{ ansible_distribution_release }} main' "
+  sudo: true
+  with_items: apt_repos
+  when: ansible_os_family == 'Debian'
+
+- name: install system packages apt
+  apt: name={{ item }} state=installed update_cache=true  force=yes
+  sudo: true
+  with_items: system_packages
+  when: ansible_os_family == 'Debian'
+
+- name: install system packages yum
+  yum: name={{ item }} state=installed
+  sudo: true
+  with_items: system_packages
+  when: ansible_os_family == 'RedHat'
diff --git a/roles/vncserver/vars/CentOS_x86_64.yml b/roles/vncserver/vars/CentOS_x86_64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..640f11fbcf3e5b796f4aa6ea83cdaa625eb6dc8c
--- /dev/null
+++ b/roles/vncserver/vars/CentOS_x86_64.yml
@@ -0,0 +1,4 @@
+---
+ system_packages:
+   - "@desktop"
+   - tigervnc-server
diff --git a/roles/vncserver/vars/Ubuntu_x86_64.yml b/roles/vncserver/vars/Ubuntu_x86_64.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d60dc6b5564ef1a0870ba7024ac4572d7771d
--- /dev/null
+++ b/roles/vncserver/vars/Ubuntu_x86_64.yml
@@ -0,0 +1,7 @@
+---
+ system_packages:
+   - mate-desktop-environment
+   - tightvncserver
+
+ apt_repos:
+   - "http://repo.mate-desktop.org/archive/1.8/ubuntu"