Merge branch 'master' into java6

Conflicts:
	README.md
	project.clj

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-jtwig-java6 "0.3"
+(defproject clj-jtwig-java6 "0.3.1"
   :description "Clojure wrapper for JTwig (Java 6 dependencies)"
   :url "https://github.com/gered/clj-jtwig/tree/java6"
   :license {:name "Apache License, Version 2.0"

src/clj_jtwig/standard_functions.clj

@@ -25,10 +25,6 @@
             (-> sequence vals butlast)
             (butlast sequence)))}
 
-   "capitalize_all"
-   {:fn (fn [s]
-          (WordUtils/capitalize s))}
-
    "center"
    {:fn (fn [s size & [padding-string]]
           (StringUtils/center s size (or padding-string " ")))}

test/clj_jtwig/functions_test.clj

@@ -284,10 +284,6 @@
     (is (= (render "{{ [1, 2, 3, 4, 5]|butlast }}" nil)
            "[1, 2, 3, 4]")))
 
-  (testing "capitalize_all"
-    (is (= (render "{{ capitalize_all('hello world') }}" nil)
-           "Hello World")))
-
   (testing "center"
     (is (= (render "{{ center('bat', 5) }}" nil)
            " bat "))