Update haiku
Merge branch 'master' of https://github.com/EBHeadrick/poem

Conflicts:
	haiku

manually merged orphan revision from EB