sh master merge

rebar.config

@@ -1,4 +1,8 @@
 {deps_dir,"deps"}.
 {erl_opts, [nowarn_export_all]}.
 {deps, [%{ling, ".*", {git, "git://github.com/cloudozer/ling", {tag, "master"}}},
+<<<<<<< HEAD
         {sh, ".*",   {git, "git://github.com/synrc/sh", []}}]}.
+=======
+        {sh, ".*",   {git, "git://github.com/synrc/sh", {tag, []}}}]}.
+>>>>>>> 09245c9bf84a64e3685768ffbb047824dc136857