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
whitespace
whitespace
[lib] add merlin
[lib] rework blog support

Conflicts:
	_tags
	setup.ml
[lib] permalinks begin with '/'
[lib] fix links in atom feed
[lib_test] update to `lib`
[make] finish separation of my site
[make] let oasis uninstall do the work, idiot
[make] update phony
[travis] add omd dependency back in
[blog] more usual compare behaviour
[blog] oops, now understand the reason for the non-standard compare ordering

(we generally want most-recent-first rather than oldest-first)
Merge branch 'master' of https://github.com/mirage/cowabloga
Merge pull request #5 from mor1/master

moar abstraction and structure
Adapt test to latest cohttp API