Merge branch 'master' of github.com:hakimel/reveal.js into dev

.gitignore

@@ -1,3 +1,8 @@
+.idea/
+*.iml
+*.iws
+*.eml
+out/
 .DS_Store
 .svn
 log/*.log
@@ -5,4 +10,4 @@ tmp/**
 node_modules/
 .sass-cache
 css/reveal.min.css
-js/reveal.min.js
+js/reveal.min.js

package.json

@@ -22,10 +22,11 @@
     "node": "~4.1.1"
   },
   "dependencies": {
-    "underscore": "~1.8.3",
     "express": "~4.13.3",
-    "mustache": "~2.1.3",
-    "socket.io": "~1.3.7"
+    "grunt-cli": "^0.1.13",
+    "mustache": "~2.2.1",
+    "socket.io": "~1.3.7",
+    "underscore": "~1.8.3"
   },
   "devDependencies": {
     "grunt-contrib-qunit": "~0.7.0",