merged dev branch

Gruntfile.js

@@ -70,7 +70,9 @@ module.exports = function(grunt) {
 					head: false,
 					module: false,
 					console: false,
-					unescape: false
+					unescape: false,
+					define: false,
+					exports: false
 				}
 			},
 			files: [ 'Gruntfile.js', 'js/reveal.js' ]
@@ -96,7 +98,9 @@ module.exports = function(grunt) {
 			server: {
 				options: {
 					port: port,
-					base: '.'
+					base: '.',
+                    livereload: true,
+                    open: true
 				}
 			}
 		},
@@ -113,6 +117,9 @@ module.exports = function(grunt) {
 		},
 
 		watch: {
+            options: {
+                livereload: true
+            },
 			main: {
 				files: [ 'Gruntfile.js', 'js/reveal.js', 'css/reveal.css' ],
 				tasks: 'default'
@@ -124,7 +131,10 @@ module.exports = function(grunt) {
 			css: {
 				files: [ 'css/reveal.bare.css' ],
 				tasks: 'css'
-			}
+			},
+            html: {
+                files: [ 'index.html']
+            }
 		}
 
 	});