Merge branch 'master' of https://github.com/TimStallard/timstallard.me.uk

docpad.js

@@ -45,16 +45,16 @@ var docpadConfig = {
 	events: {
 		populateCollections: function(){
 			this.docpad.blocks["scripts"].add([
-				"/libs/jquery.min.js",
-				"/libs/jquery.smoothState.min.js",
+				"/vendor/jquery.min.js",
+				"/vendor/jquery.smoothState.min.js",
 				"/script.js"
 			], {
 				defer: false
 			});
 			this.docpad.blocks["styles"].add([
-				"/libs/Animate.css",
-				"/libs/fa.css",
-				"/libs/agate.css",
+				"/vendor/Animate.css",
+				"/vendor/fa.css",
+				"/vendor/agate.css",
 				"/styles.css",
 				"https://fonts.googleapis.com/css?family=Open+Sans"
 			]);

src/files/contactsubmit/index.php

@@ -1,7 +1,7 @@
 <?php
 
-require "./class.smtp.php";
-require "./class.phpmailer.php";
+require "./vendor/class.smtp.php";
+require "./vendor/class.phpmailer.php";
 require "./conf.php";
 
 $mail = new PHPMailer;