Merge branch 'master' of git@github.com:tobi/liquid

Conflicts:
	lib/liquid.rb
	lib/liquid/context.rb
	lib/liquid/variable.rb
	test/standard_tag_test.rb

Rakefile

@@ -21,4 +21,11 @@ Hoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.author         = "Tobias Luetke"
   p.email          = "tobi@leetsoft.com"
   p.url            = "http://www.liquidmarkup.org"    
+end
+
+desc "Run the liquid profile/perforamce coverage"
+task :profile do
+  
+  ruby "performance/shopify.rb"
+  
 end