diff --git a/.gitignore b/.gitignore
index 5d8a5a2..c408720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,10 @@ bower_components/
 node_modules/
 out/
 
+# Private Files
+.env
+
+
 # =====================================
 # CUSTOM MODIFICATIONS
 
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..643c399
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,63 @@
+{
+  // enforcing options
+  "bitwise": true,
+  "camelcase": true,
+  "curly": false,  // we like one liners
+  "eqeqeq": true,
+  "es3": true,
+  "forin": true,
+  "freeze": true,
+  "immed": true,
+  "indent": 1,  // we use tabs
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonbsp": true,
+  "nonew": true,
+  "plusplus": false,  // we are good at js
+  "quotmark": false,  // we like flexibility
+  "undef": true,
+  "unused": true,
+  "strict": true,
+  "trailing": true,
+  "maxparams": false,  // no
+  "maxdepth": false,   // no
+  "maxstatements": false,  // no
+  "maxcomplexity": false,  // no
+  "maxlen": false,  // no
+  
+  // relaxing options
+  "asi": true,  // we use asi
+  "boss": true,  // we understand assignments
+  "debug": false,
+  "eqnull": true,  // we know how to do null/undefined checks
+  "esnext": false,
+  "evil": false,
+  "expr": false,
+  "funcscope": false,
+  "gcl": true,
+  "globalstrict": false,
+  "iterator": false,
+  "lastsemic": false,
+  "laxbreak": false,
+  "laxcomma": false,
+  "loopfunc": false,
+  "moz": false,
+  "multistr": false,
+  "notypeof": false,
+  "proto": false,
+  "scripturl": false,
+  "smarttabs": false,  // default; spaces should only be mixed with tabs after words
+  "shadow": false,
+  "sub": false,
+  "supernew": false,
+  "noyield": false,
+  
+  // environments
+  "browser": true,
+  "node": true,
+  
+  // legacy
+  "onevar": false
+}
diff --git a/.npmignore b/.npmignore
index 91caedf..04f814f 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,4 @@
-# v1.3.10 December 10, 2013
+# v1.3.23 October 11, 2014
 # https://github.com/bevry/base
 
 # Temp Files
@@ -11,7 +11,14 @@ components/
 bower_components/
 node_modules/
 
+# Private Files
+.env
+
 # Development Files
+.editorconfig
+.eslintrc
+.jshintrc
+coffeelint.json
 .travis*
 Cakefile
 Makefile
diff --git a/.travis.yml b/.travis.yml
index 54f953e..9eab201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
-# v1.3.14 February 6, 2014
+# v1.3.23 October 11, 2014
 # https://github.com/bevry/base
 language: node_js
-install: "npm install; ./node_modules/.bin/cake install"
+# ensure npm@1 is the latest 0.8 compatible version (needed to ensure modules are installed correctly)
+# ensure coffee-script is installed (needed for cake commands)
+# ensure dev dependencies are installed (handled via npm install)
+# ensure test dependencies are installed (handled via cake install)
+install: "npm install -g npm@1 && npm install coffee-script && npm install && ./node_modules/.bin/cake install"
+# ensure our application is compiled before we run our tests
 before_script: "./node_modules/.bin/cake compile"
 script: "npm test"
 node_js:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6dc12e4..011ee84 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 <!--
-v1.3.10 December 10, 2013
+v1.3.22 June 23, 2013
 https://github.com/bevry/base
 -->
 
@@ -9,9 +9,9 @@ https://github.com/bevry/base
 
 ## Resources
 
-- [Coding Standards](http://bevry.me/bevry/coding-standards)
-- [Documentation Guidelines](http://bevry.me/bevry/documentation-guidelines)
-- [Support Guidelines](http://bevry.me/bevry/support-guidelines)
+- [Coding Standards](http://learn.bevry.me/community/coding-standards)
+- [Documentation Guidelines](http://learn.bevry.me/community/documentation-guidelines)
+- [Support Guidelines](http://learn.bevry.me/community/support-guidelines)
 
 
 ## Development
diff --git a/Cakefile b/Cakefile
index 07c73ce..8a076ef 100644
--- a/Cakefile
+++ b/Cakefile
@@ -1,4 +1,4 @@
-# v1.3.15 May 16, 2014
+# v1.3.20 June 16, 2014
 # https://github.com/bevry/base
 
 
@@ -18,27 +18,29 @@ NPM              = (if WINDOWS then process.execPath.replace('node.exe', 'npm.cm
 EXT              = (if WINDOWS then '.cmd' else '')
 GIT              = "git"
 
-APP_PATH        = process.cwd()
+APP_PATH         = process.cwd()
 PACKAGE_PATH     = pathUtil.join(APP_PATH, "package.json")
 PACKAGE_DATA     = require(PACKAGE_PATH)
 
 MODULES_PATH     = pathUtil.join(APP_PATH, "node_modules")
 DOCPAD_PATH      = pathUtil.join(MODULES_PATH, "docpad")
-BIN_PATH         = pathUtil.join(MODULES_PATH, ".bin")
-CAKE             = pathUtil.join(BIN_PATH, "cake" + EXT)
-COFFEE           = pathUtil.join(BIN_PATH, "coffee" + EXT)
-PROJECTZ         = pathUtil.join(BIN_PATH, "projectz" + EXT)
-DOCCO            = pathUtil.join(BIN_PATH, "docco" + EXT)
-DOCPAD           = pathUtil.join(BIN_PATH, "docpad" + EXT)
+CAKE             = pathUtil.join(MODULES_PATH, "coffee-script/bin/cake")
+COFFEE           = pathUtil.join(MODULES_PATH, "coffee-script/bin/coffee")
+PROJECTZ         = pathUtil.join(MODULES_PATH, "projectz/bin/projectz")
+DOCCO            = pathUtil.join(MODULES_PATH, "docco/bin/docco")
+DOCPAD           = pathUtil.join(MODULES_PATH, "docpad/bin/docpad")
+BISCOTTO         = pathUtil.join(MODULES_PATH, "biscotto/bin/biscotto")
 
 config = {}
-config.TEST_PATH = "test"
-config.DOCCO_SRC_PATH   = null
-config.DOCCO_OUT_PATH   = "docs"
-config.COFFEE_SRC_PATH  = null
-config.COFFEE_OUT_PATH  = "out"
-config.DOCPAD_SRC_PATH  = null
-config.DOCPAD_OUT_PATH  = "out"
+config.TEST_PATH           = "test"
+config.DOCCO_SRC_PATH      = null
+config.DOCCO_OUT_PATH      = "docs"
+config.BISCOTTO_SRC_PATH   = null
+config.BISCOTTO_OUT_PATH   = "docs"
+config.COFFEE_SRC_PATH     = null
+config.COFFEE_OUT_PATH     = "out"
+config.DOCPAD_SRC_PATH     = null
+config.DOCPAD_OUT_PATH     = "out"
 
 for own key,value of (PACKAGE_DATA.cakeConfiguration or {})
 	config[key] = value
@@ -133,11 +135,11 @@ actions =
 		step2 = ->
 			return step3()  if !config.COFFEE_SRC_PATH or !fsUtil.existsSync(COFFEE)
 			console.log('coffee compile')
-			spawn(COFFEE, ['-co', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
+			spawn(NODE, [COFFEE, '-co', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
 		step3 = ->
 			return step4()  if !config.DOCPAD_SRC_PATH or !fsUtil.existsSync(DOCPAD)
 			console.log('docpad generate')
-			spawn(DOCPAD, ['generate'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step4)
+			spawn(NODE, [DOCPAD, 'generate'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step4)
 		step4 = next
 
 		# Start
@@ -154,12 +156,12 @@ actions =
 		step2 = ->
 			return step3()  if !config.COFFEE_SRC_PATH or !fsUtil.existsSync(COFFEE)
 			console.log('coffee watch')
-			spawn(COFFEE, ['-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe)  # background
+			spawn(NODE, [COFFEE, '-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe)  # background
 			step3()  # continue while coffee runs in background
 		step3 = ->
 			return step4()  if !config.DOCPAD_SRC_PATH or !fsUtil.existsSync(DOCPAD)
 			console.log('docpad run')
-			spawn(DOCPAD, ['run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe)  # background
+			spawn(NODE, [DOCPAD, 'run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe)  # background
 			step4()  # continue while docpad runs in background
 		step4 = next
 
@@ -193,12 +195,16 @@ actions =
 		step2 = ->
 			return step3()  if !fsUtil.existsSync(PROJECTZ)
 			console.log('projectz compile')
-			spawn(PROJECTZ, ['compile'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
+			spawn(NODE, [PROJECTZ, 'compile'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
 		step3 = ->
 			return step4()  if !config.DOCCO_SRC_PATH or !fsUtil.existsSync(DOCCO)
 			console.log('docco compile')
-			exec("#{DOCCO} -o #{config.DOCCO_OUT_PATH} #{config.DOCCO_SRC_PATH}", {stdio:'inherit', cwd:APP_PATH}, safe next, step4)
+			exec("#{NODE} #{DOCCO} -o #{config.DOCCO_OUT_PATH} #{config.DOCCO_SRC_PATH}", {stdio:'inherit', cwd:APP_PATH}, safe next, step4)
 		step4 = ->
+			return step5()  if !config.BISCOTTO_SRC_PATH or !fsUtil.existsSync(BISCOTTO)
+			console.log('biscotto compile')
+			exec("""#{BISCOTTO} --name #{PACKAGE_DATA.title or PACKAGE_DATA.name} --title "#{PACKAGE_DATA.title or PACKAGE_DATA.name} API Documentation" --readme README.md --output-dir #{config.BISCOTTO_OUT_PATH} #{config.BISCOTTO_SRC_PATH} - LICENSE.md HISTORY.md""", {stdio:'inherit', cwd:APP_PATH}, safe next, step5)
+		step5 = ->
 			console.log('cake test')
 			actions.test(opts, safe next, step5)
 		step5 = next
diff --git a/HISTORY.md b/HISTORY.md
index ea715a3..1e16e9a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,7 @@
 - v2.4.x
 	- Updated dependencies
 		- coffee-script 1.6.3 to 1.7.1
+	- Added support for partials directory
 
 - v2.3.0 January 10, 2014
 	- Repackaged
diff --git a/README.md b/README.md
index 1e9f5c0..6d4ff2b 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ plugins:
 			getBlock: (type, additional...) ->
 				additional.pop() # remove the hash object
 				@getBlock(type).add(additional).toHTML()
+		partialsDir: './src/layouts/partials'
 		partials:
 			title: '<h1>{{document.title}}</h1>'
 			goUp: '<a href="#">Scroll up</a>'
diff --git a/coffeelint.json b/coffeelint.json
new file mode 100644
index 0000000..d07f481
--- /dev/null
+++ b/coffeelint.json
@@ -0,0 +1,114 @@
+{
+    "coffeescript_error": {
+        "level": "error"
+    },
+    "arrow_spacing": {
+        "name": "arrow_spacing",
+        "level": "error"
+    },
+    "no_tabs": {
+        "name": "no_tabs",
+        "level": "ignore"
+    },
+    "no_trailing_whitespace": {
+        "name": "no_trailing_whitespace",
+        "level": "error",
+        "allowed_in_comments": false,
+        "allowed_in_empty_lines": true
+    },
+    "max_line_length": {
+        "name": "max_line_length",
+        "value": 80,
+        "level": "ignore",
+        "limitComments": true
+    },
+    "line_endings": {
+        "name": "line_endings",
+        "level": "error",
+        "value": "unix"
+    },
+    "no_trailing_semicolons": {
+        "name": "no_trailing_semicolons",
+        "level": "error"
+    },
+    "indentation": {
+        "name": "indentation",
+        "value": 1,
+        "level": "error"
+    },
+    "camel_case_classes": {
+        "name": "camel_case_classes",
+        "level": "error"
+    },
+    "colon_assignment_spacing": {
+        "name": "colon_assignment_spacing",
+        "level": "ignore",
+        "spacing": {
+            "left": 0,
+            "right": 0
+        }
+    },
+    "no_implicit_braces": {
+        "name": "no_implicit_braces",
+        "level": "ignore",
+        "strict": true
+    },
+    "no_plusplus": {
+        "name": "no_plusplus",
+        "level": "ignore"
+    },
+    "no_throwing_strings": {
+        "name": "no_throwing_strings",
+        "level": "error"
+    },
+    "no_backticks": {
+        "name": "no_backticks",
+        "level": "ignore"
+    },
+    "no_implicit_parens": {
+        "name": "no_implicit_parens",
+        "level": "ignore"
+    },
+    "no_empty_param_list": {
+        "name": "no_empty_param_list",
+        "level": "error"
+    },
+    "no_stand_alone_at": {
+        "name": "no_stand_alone_at",
+        "level": "ignore"
+    },
+    "space_operators": {
+        "name": "space_operators",
+        "level": "ignore"
+    },
+    "duplicate_key": {
+        "name": "duplicate_key",
+        "level": "error"
+    },
+    "empty_constructor_needs_parens": {
+        "name": "empty_constructor_needs_parens",
+        "level": "ignore"
+    },
+    "cyclomatic_complexity": {
+        "name": "cyclomatic_complexity",
+        "value": 10,
+        "level": "ignore"
+    },
+    "newlines_after_classes": {
+        "name": "newlines_after_classes",
+        "value": 3,
+        "level": "ignore"
+    },
+    "no_unnecessary_fat_arrows": {
+        "name": "no_unnecessary_fat_arrows",
+        "level": "warn"
+    },
+    "missing_fat_arrows": {
+        "name": "missing_fat_arrows",
+        "level": "ignore"
+    },
+    "non_empty_constructor_needs_parens": {
+        "name": "non_empty_constructor_needs_parens",
+        "level": "ignore"
+    }
+}
diff --git a/package.json b/package.json
index cd259a5..3e428f7 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
     "Gilles Bouthenot (https://github.com/gbouthenot)",
     "Mike Moulton <mike@meltmedia.com> (https://github.com/mmoulton)",
     "RobLoach (https://github.com/RobLoach)",
-    "Tobias Birmili <birmili@mecodia.de> (https://github.com/toabi)"
+    "Tobias Birmili <birmili@mecodia.de> (https://github.com/toabi)",
+    "Michael Barlock (https://github.com/mbarlock)"
   ],
   "bugs": {
     "url": "https://github.com/docpad/docpad-plugin-handlebars/issues"
@@ -32,7 +33,9 @@
     "url": "https://github.com/docpad/docpad-plugin-handlebars.git"
   },
   "dependencies": {
-    "handlebars": "~1.3.0"
+    "handlebars": "~2.0.0",
+    "wrench": "~1.5.8",
+    "safefs": "~3.1.1"
   },
   "devDependencies": {
     "coffee-script": "~1.7.1",
@@ -66,4 +69,4 @@
   "cakeConfiguration": {
     "COFFEE_SRC_PATH": "src"
   }
-}
\ No newline at end of file
+}
diff --git a/src/handlebars.plugin.coffee b/src/handlebars.plugin.coffee
index 85a8026..3d7053e 100644
--- a/src/handlebars.plugin.coffee
+++ b/src/handlebars.plugin.coffee
@@ -1,3 +1,7 @@
+fs = require('safefs')
+wrench = require('wrench')
+path = require('path')
+
 module.exports = (BasePlugin) ->
 
 	# Define Plugin
@@ -48,7 +52,7 @@ module.exports = (BasePlugin) ->
 			argv.amdPath ?= ""
 
 			pre = post = "";
-			
+
 			# slug for {src}/tpl/a/abc/test.js.handlebars is "tpl-a-abc-test"
 			templateName = opts.file.attributes.slug;
 			if (argv.wrapper is "amd")
@@ -66,3 +70,17 @@ module.exports = (BasePlugin) ->
 				post += '})();'
 
 			return pre + @handlebars.precompile(opts.content) + post
+
+		generateBefore: (opts, next) ->
+			partialsDir = @config.partialsDir
+			handlebars = @handlebars
+			docpad = @docpad
+			if partialsDir
+				wrench.readdirRecursive partialsDir, (err, files) ->
+					return docpad.error(err) if err
+
+					for fileName in files when fileName.match /(hb|hbs|handlebars)$/
+						filePath = path.join(partialsDir, fileName).replace(path.sep, '/')
+						partial = fs.readFileSync filePath, 'utf8'
+						handlebars.registerPartial(fileName.split('.')[0], partial)
+					next()
diff --git a/test/docpad.cson b/test/docpad.cson
index 75c00e7..2a25f00 100644
--- a/test/docpad.cson
+++ b/test/docpad.cson
@@ -4,7 +4,8 @@
 			helpers:
 				helperTest: () ->
 					output = "Testing Helpers"
+			partialsDir: './test/src/layouts/partials'
 			partials:
 				partial1: '<h1>{{document.example}}</h1>'
 				partial2: '<a href="#">Scroll up</a>'
-}
\ No newline at end of file
+}
diff --git a/test/out-expected/handlebars-partials-dir.html b/test/out-expected/handlebars-partials-dir.html
new file mode 100644
index 0000000..11c051a
--- /dev/null
+++ b/test/out-expected/handlebars-partials-dir.html
@@ -0,0 +1,3 @@
+<h1>Handlebars Example</h1>
+<h1>Handlebars Example</h1>
+<a href="#">Scroll up</a>
diff --git a/test/out-expected/handlebars-partials-namespace.html b/test/out-expected/handlebars-partials-namespace.html
new file mode 100644
index 0000000..7771bd3
--- /dev/null
+++ b/test/out-expected/handlebars-partials-namespace.html
@@ -0,0 +1,3 @@
+<h1>Handlebars Example</h1>
+<h1>Handlebars Example</h1>
+<h1>Namespaced!</h1>
diff --git a/test/out-expected/handlebars-partials.html b/test/out-expected/handlebars-partials.html
index a60a443..ce7897e 100644
--- a/test/out-expected/handlebars-partials.html
+++ b/test/out-expected/handlebars-partials.html
@@ -1,3 +1 @@
-<h1>Handlebars Example</h1>
-<h1>Handlebars Example</h1>
-<a href="#">Scroll up</a>
\ No newline at end of file
+<h1>Handlebars Example</h1><h1>Handlebars Example</h1><a href="#">Scroll up</a>
\ No newline at end of file
diff --git a/test/out-expected/handlebars.inlinejs b/test/out-expected/handlebars.inlinejs
index e525761..cbca626 100644
--- a/test/out-expected/handlebars.inlinejs
+++ b/test/out-expected/handlebars.inlinejs
@@ -1,14 +1,9 @@
 (function() {
   var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['handlebars'] = template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
-  buffer += "<h1>"
-    + escapeExpression(((stack1 = ((stack1 = (depth0 && depth0.document)),stack1 == null || stack1 === false ? stack1 : stack1.example)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+templates['handlebars'] = template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<h1>"
+    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.document : depth0)) != null ? stack1.example : stack1), depth0))
     + "</h1>";
-  return buffer;
-  });
+},"useData":true});
 })();
\ No newline at end of file
diff --git a/test/src/documents/handlebars-partials-dir.html.hbs b/test/src/documents/handlebars-partials-dir.html.hbs
new file mode 100644
index 0000000..89aa45a
--- /dev/null
+++ b/test/src/documents/handlebars-partials-dir.html.hbs
@@ -0,0 +1,6 @@
+---
+example: 'Handlebars Example'
+---
+{{>partial3}}
+{{>partial3}}
+{{>partial4}}
diff --git a/test/src/documents/handlebars-partials-namespace.html.hbs b/test/src/documents/handlebars-partials-namespace.html.hbs
new file mode 100644
index 0000000..505eb18
--- /dev/null
+++ b/test/src/documents/handlebars-partials-namespace.html.hbs
@@ -0,0 +1,6 @@
+---
+example: 'Handlebars Example'
+---
+{{>partial3}}
+{{>partial3}}
+{{>namespace/partial5}}
diff --git a/test/src/layouts/partials/namespace/partial5.hbs b/test/src/layouts/partials/namespace/partial5.hbs
new file mode 100644
index 0000000..ef643a1
--- /dev/null
+++ b/test/src/layouts/partials/namespace/partial5.hbs
@@ -0,0 +1 @@
+<h1>Namespaced!</h1>
diff --git a/test/src/layouts/partials/partial3.hbs b/test/src/layouts/partials/partial3.hbs
new file mode 100644
index 0000000..a1c16a0
--- /dev/null
+++ b/test/src/layouts/partials/partial3.hbs
@@ -0,0 +1 @@
+<h1>{{document.example}}</h1>
diff --git a/test/src/layouts/partials/partial4.hbs b/test/src/layouts/partials/partial4.hbs
new file mode 100644
index 0000000..bab2368
--- /dev/null
+++ b/test/src/layouts/partials/partial4.hbs
@@ -0,0 +1 @@
+<a href="#">Scroll up</a>