diff --git a/.arclint b/.arclint
index 9f43cc0..a6fd6f2 100644
--- a/.arclint
+++ b/.arclint
@@ -1,18 +1,19 @@
 {
   "linters": {
     "spelling-linter": {
       "type": "spelling",
       "include": "(.md$)"
     },
     "filename-linter": {
       "type": "filename"
     },
     "text-linter": {
       "type": "text",
       "exclude": [
             "(.http$)",
-            "(.patch$)"
+            "(.patch$)",
+            "(^Makefile$)"
         ]
     }
   }
 }
diff --git a/.gitmodules b/.gitmodules
index c8c5e8c..70e7b8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,30 +1,30 @@
 [submodule "nfs"]
-	path = roles/nfs
-	url = https://github.com/geerlingguy/ansible-role-nfs.git
+    path = roles/nfs
+    url = https://github.com/geerlingguy/ansible-role-nfs.git
 [submodule "roles/swap"]
-	path = roles/swap
-	url = https://github.com/tribou/ansible-swap.git
+    path = roles/swap
+    url = https://github.com/tribou/ansible-swap.git
 [submodule "roles/yumrepo"]
-	path = roles/yumrepo
-	url = https://github.com/picotrading/ansible-yumrepo.git
+    path = roles/yumrepo
+    url = https://github.com/picotrading/ansible-yumrepo.git
 [submodule "templates/encoder"]
-	path = templates/encoder
-	url = https://github.com/picotrading/config-encoder-macros
+    path = templates/encoder
+    url = https://github.com/picotrading/config-encoder-macros
 [submodule "roles/keepalived"]
-	path = roles/keepalived
-	url = https://github.com/tcomerma/ansible-keepalived.git
+    path = roles/keepalived
+    url = https://github.com/tcomerma/ansible-keepalived.git
 [submodule "roles/glusterfs"]
-	path = roles/glusterfs
-	url = https://github.com/geerlingguy/ansible-role-glusterfs.git
+    path = roles/glusterfs
+    url = https://github.com/geerlingguy/ansible-role-glusterfs.git
 [submodule "roles/nagios"]
-	path = roles/nrpe
-	url = https://github.com/Mooash/nagios-nrpe-server.git
+    path = roles/nrpe
+    url = https://github.com/Mooash/nagios-nrpe-server.git
 [submodule "roles/jenkins"]
-	path = roles/jenkins
-	url = https://github.com/rorist/ansible-jenkins
+    path = roles/jenkins
+    url = https://github.com/rorist/ansible-jenkins
 [submodule "roles/rolling-reboot"]
-	path = roles/rolling-reboot
-	url = https://github.com/rorist/ansible-rolling-reboot.git
+    path = roles/rolling-reboot
+    url = https://github.com/rorist/ansible-rolling-reboot.git
 [submodule "roles/postfix"]
-	path = roles/postfix
-	url = https://github.com/mrlesmithjr/ansible-postfix.git
+    path = roles/postfix
+    url = https://github.com/mrlesmithjr/ansible-postfix.git
diff --git a/roles/apache/templates/placeholder.conf b/roles/apache/templates/placeholder.conf
index e69de29..153d8ca 100644
--- a/roles/apache/templates/placeholder.conf
+++ b/roles/apache/templates/placeholder.conf
@@ -0,0 +1 @@
+#Empty file
diff --git a/roles/nagios/templates/contacts.cfg b/roles/nagios/templates/contacts.cfg
index 72e3299..f918761 100644
--- a/roles/nagios/templates/contacts.cfg
+++ b/roles/nagios/templates/contacts.cfg
@@ -1,12 +1,12 @@
 define contactgroup{
-	contactgroup_name       c4science_admins
-	alias                   Nagios Administrators
-	members                 admin
+    contactgroup_name       c4science_admins
+    alias                   Nagios Administrators
+    members                 admin
 }
 
 define contact {
-	contact_name            admin
-	use                     generic-contact
-	alias                   Nagios Admin
-	email                   {{ email_monitoring }}
+    contact_name            admin
+    use                     generic-contact
+    alias                   Nagios Admin
+    email                   {{ email_monitoring }}
 }
diff --git a/roles/phabricator/files/PhutilAuthAdapterShibboleth.php b/roles/phabricator/files/PhutilAuthAdapterShibboleth.php
index 4efa7a7..d1ee139 100644
--- a/roles/phabricator/files/PhutilAuthAdapterShibboleth.php
+++ b/roles/phabricator/files/PhutilAuthAdapterShibboleth.php
@@ -1,207 +1,207 @@
 <?php
 
 final class PhutilAuthAdapterShibboleth extends PhutilAuthAdapter {
 
   // Configuration.
   private $shibSessionIdField;
   private $shibApplicationIdField;
   private $useridField;
   private $usernameField;
   private $realnameField;
   private $firstnameField;
   private $lastnameField;
   private $emailField;
   private $pageURIPattern;
   private $imageURIPattern;
   private $usernameFromRealname;
 
   // Specific User Request Information.
   private $shibSessionId;
   private $shibApplicationId;
   private $userid;
   private $username;
   private $realname;
   private $firstname;
   private $lastname;
   private $email;
 
   //
   // Configuration setters.
   //
   public function setShibSessionIdField($value) {
     $this->shibSessionIdField = $value;
     return $this;
   }
 
   public function setShibApplicationIdField($value) {
     $this->shibApplicationIdField = $value;
     return $this;
   }
 
   public function setUseridField($value) {
     $this->useridField = $value;
     return $this;
   }
 
   public function setUsernameField($value) {
     $this->usernameField = $value;
     return $this;
   }
 
   public function setRealnameField($value) {
     $this->realnameField = $value;
     return $this;
   }
 
   public function setEmailField($value) {
     $this->emailField = $value;
     return $this;
   }
 
   public function setFirstnameField($value) {
     $this->firstnameField = $value;
     return $this;
   }
 
   public function setLastnameField($value) {
     $this->lastnameField = $value;
     return $this;
   }
 
   public function setPageURIPattern($value) {
     $this->pageURIPattern = $value;
     return $this;
   }
 
   public function setImageURIPattern($value) {
     $this->imageURIPattern = $value;
     return $this;
   }
 
   public function setIsGeneratedUsername($value) {
     $this->usernameFromRealname = $value;
     return $this;
   }
 
   //
   // Implementation of PhutilAuthAdapter interface.
   // User information getters.
   //
 
   public function getAccountID() {
     return $this->userid;
   }
 
   public function getAdapterType() {
     return 'shibboleth';
   }
 
   public function getAdapterDomain() {
     return 'self';
   }
 
   public function getAccountEmail() {
     return $this->email;
   }
 
   public function getAccountName() {
     return $this->username;
   }
 
   public function getAccountURI() {
     if (strlen($this->pageURIPattern)) {
       return sprintf($this->pageURIPattern, $this->username);
     }
     return null;
   }
 
   public function getAccountImageURI() {
     if (strlen($this->imageURIPattern)) {
       return sprintf($this->imageURIPattern, $this->username);
     }
     return null;
   }
 
   public function getAccountRealName() {
     return $this->realname;
   }
 
   //
   // Extraction of user information from environement variables.
   //
   public function getEnvNames() {
     return array(
       $this->shibSessionIdField,
       $this->shibApplicationIdField,
       $this->useridField,
       $this->usernameField,
       $this->realnameField,
       $this->firstnameField,
       $this->lastnameField,
       $this->emailField,
     );
   }
 
   public function setUserDataFromRequest($env) {
 
     $this->shibSessionId     = $env[$this->shibSessionIdField];
     $this->shibApplicationId = $env[$this->shibApplicationIdField];
     $this->userid            = $env[$this->useridField];
     $this->username          = $env[$this->usernameField];
     $this->realname          = $env[$this->realnameField];
     $this->firstname         = $env[$this->firstnameField];
     $this->lastname          = $env[$this->lastnameField];
     $this->email             = $env[$this->emailField];
 
     if ($this->usernameFromRealname) {
       for ($len=0; $len < strlen($this->firstname); $len++) {
         $username = $this->generateUsername($len);
         $user_exists = id(new PhabricatorPeopleQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->setLimit(1)
           ->withUsernames(array($username))
           ->execute();
         $this->username = $username;
         if (!$user_exists) {
           break;
         }
       }
     }
 
     if(!strlen($this->realname) && strlen($this->firstname) && strlen($this->lastname)){
         $this->realname = $this->firstname . ' ' . $this->lastname;
     }
 
     if (!strlen($this->shibSessionId)
       || !strlen($this->shibApplicationId)
       || !strlen($this->userid)
       || !strlen($this->username)
       || !strlen($this->realname)
       || !strlen($this->email)
       ) {
       phlog("SHIB ERROR");
       phlog("SessionID: "       . $this->shibApplicationId  . " (" . strlen($this->shibApplicationId)   . ")");
       phlog("ApplicationID: "   . $this->shibSessionId      . " (" . strlen($this->shibSessionId)       . ")");
       phlog("UserID: "          . $this->userid             . " (" . strlen($this->userid)              . ")");
       phlog("Username: "        . $this->username           . " (" . strlen($this->username)            . ")");
       phlog("Realname: "        . $this->realname           . " (" . strlen($this->realname)            . ")");
       phlog("Firstname: "       . $this->firstname          . " (" . strlen($this->firstname)           . ")");
       phlog("Lastname: "        . $this->lastname           . " (" . strlen($this->lastname)            . ")");
       phlog("Email: "           . $this->email              . " (" . strlen($this->email)               . ")");
       return false;
     }
 
     return $this;
   }
 
   private function generateUsername($len) {
     return $this->cleanName($this->lastname) . substr($this->cleanName($this->firstname), 0, $len);
   }
 
   private function cleanName($name) {
-	$clean = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
-	$clean = preg_replace("/[ -]/", '', $clean);
-	$clean = strtolower(trim($clean));
-	return $clean;
+    $clean = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
+    $clean = preg_replace("/[ -]/", '', $clean);
+    $clean = strtolower(trim($clean));
+    return $clean;
   }
 }