diff --git a/notes/notes.js b/notes/notes.js
deleted file mode 100644
index e065874..0000000
--- a/notes/notes.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Handles opening of and synchronization with the reveal.js
- * notes window.
- */
-var RevealNotes = (function() {
-
-	function openNotes() {
-		var notesPopup = window.open( 'reveal/plugin/notes/notes.html', 'reveal.js - Notes', 'width=1120,height=850' );
-
-		// Fires when slide is changed
-		Reveal.addEventListener( 'slidechanged', function( event ) {
-			post('slidechanged');
-		} );
-
-		// Fires when a fragment is shown
-		Reveal.addEventListener( 'fragmentshown', function( event ) {
-			post('fragmentshown');
-		} );
-
-		// Fires when a fragment is hidden
-		Reveal.addEventListener( 'fragmenthidden', function( event ) {
-			post('fragmenthidden');
-		} );
-
-		/**
-		 * Posts the current slide data to the notes window
-		 *
-		 * @param {String} eventType Expecting 'slidechanged', 'fragmentshown' 
-		 * or 'fragmenthidden' set in the events above to define the needed 
-		 * slideDate.
-		 */
-		function post( eventType ) {
-			var slideElement = Reveal.getCurrentSlide(),
-				messageData;
-
-			if( eventType === 'slidechanged' ) {
-				var notes = slideElement.querySelector( 'aside.notes' ),
-					indexh = Reveal.getIndices().h,
-					indexv = Reveal.getIndices().v,
-					nextindexh,
-					nextindexv;
-
-				if( slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION' ) {
-					nextindexh = indexh;
-					nextindexv = indexv + 1;
-				} else {
-					nextindexh = indexh + 1;
-					nextindexv = 0;
-				}
-
-				messageData = {
-					notes : notes ? notes.innerHTML : '',
-					indexh : indexh,
-					indexv : indexv,
-					nextindexh : nextindexh,
-					nextindexv : nextindexv,
-					markdown : notes ? typeof notes.getAttribute( 'data-markdown' ) === 'string' : false
-				};
-			}
-			else if( eventType === 'fragmentshown' ) {
-				messageData = {
-					fragment : 'next'
-				};
-			}
-			else if( eventType === 'fragmenthidden' ) {
-				messageData = {
-					fragment : 'prev'
-				};
-			}
-
-			notesPopup.postMessage( JSON.stringify( messageData ), '*' );
-		}
-
-		// Navigate to the current slide when the notes are loaded
-		notesPopup.addEventListener( 'load', function( event ) {
-			post('slidechanged');
-		}, false );
-	}
-
-	// If the there's a 'notes' query set, open directly
-	if( window.location.search.match( /(\?|\&)notes/gi ) !== null ) {
-		openNotes();
-	}
-
-	// Open the notes when the 's' key is hit
-	document.addEventListener( 'keydown', function( event ) {
-		// Disregard the event if the target is editable or a
-		// modifier is present
-		if ( document.querySelector( ':focus' ) !== null || event.shiftKey || event.altKey || event.ctrlKey || event.metaKey ) return;
-
-		if( event.keyCode === 83 ) {
-			event.preventDefault();
-			openNotes();
-		}
-	}, false );
-
-	return { open: openNotes };
-})();
diff --git a/reveal b/reveal
index 784fa9d..24c493f 160000
--- a/reveal
+++ b/reveal
@@ -1 +1 @@
-Subproject commit 784fa9d2e3570054728d21f8098199dc9d4164b9
+Subproject commit 24c493fb83bcc51e5db59e5abca246493eac8700
diff --git a/templates/reveal_base.html b/templates/reveal_base.html
index 9a8a850..415231c 100644
--- a/templates/reveal_base.html
+++ b/templates/reveal_base.html
@@ -67,7 +67,7 @@
                 { src: 'reveal/lib/js/classList.js', condition: function() { return !document.body.classList; } },
                 { src: 'reveal/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
                 { src: 'reveal/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
-                { src: 'notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
+                { src: 'reveal/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
                 { src: 'http://s7.addthis.com/js/300/addthis_widget.js', async: true},
                 { src: 'js/mathjax-onload.js', async: true}
                 ]