Merge pull request #84 from Diskmaster/pullme

Fix version string to 1.1.14 like it was before the merge/testing.

src/plugin.yml

@@ -1,6 +1,6 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 1.1.14-Disk-GIT
+version: 1.1.14
 softdepend: [Spout]
 commands:
     mchud:
@@ -252,4 +252,4 @@ permissions:
     mcmmo.skills.axes:
         description:
     mcmmo.skills.acrobatics:
-        description:
+        description: