whitespace
whitespace
[travis] simple config
[travis] hack around cohttp package not providing Lwt_unix
[merlin] add basic merlin file
[merlin] add dependency on cow
[oasis] local makefile config and overrides
[make] some local rules to wrap `oasis` and `crunch`
[lib] use minified `foundation.css`
[make] fix crunch invocation to later mir-crunch, and clean droppings
[lib] anchor css, js to base_uri
[lib] permalink as used in (eg) recent_posts needs to include `/blog/`
[oasis] add `omd` dependency

Conflicts:
	_oasis
	_tags
	setup.ml
[oasis] update with `omd` dependency

Conflicts:
	_oasis
	_tags
	setup.ml

Conflicts:
	_oasis
Merge pull request #3 from mor1/master

basic tidy-ups
[travis] add omd
Merge pull request #4 from avsm/master

[travis] add omd
[lib] add headers parameter to foundation pages

Conflicts:
	lib/foundation.ml
[lib_test] fix up to new headers parameter
whitespace