Merge branch 'master' of github.com:tdreyno/middleman

lib/middleman/templates/local.rb

@@ -1,6 +1,6 @@
 module Middleman
   def self.templates_path
-    File.join(`cd ~ && pwd`.chomp, ".middleman")
+    File.join(File.expand_path("~/"), ".middleman")
   end
 end
 
@@ -17,4 +17,4 @@ end
 Dir[File.join(Middleman.templates_path, "*")].each do |dir|
   next unless File.directory?(dir)
   Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)
-end
+end