Refactor to no longer require grunt to serve
Merge remote-tracking branch 'dropbox/master'

Conflicts:
	slides/index.html
More meat on M-JVM testing; some corrections, cleanup