Merge pull request #26 from samoht/master

Add draft slides for ML 2014
add haskell slides entry
Merge branch 'master' of github.com:mirage/mirage-decks

Conflicts:
	src/slides.ml
horizon theme `code`: no colour tweaks, more pad
Merge branch 'master' of git://github.com/mor1/mirage-decks
Add haskell slides
add mirage-dev to opam remote
Update slides
remove swap file
attempt to fix build
install aspcud
pin cohttp
fix up ml14 slides
init from git
fixed in mirage-dev
fix slide dates
reveal.js: use up-to-date `highlight.js`; restrict langs to ocaml, bash
reveal.js: prefer solarized_dark theme for highlighting
highlight.js: add up-to-date version (8.2)
Merge branch 'master' of git://github.com/mor1/mirage-decks