Merge branch 'master' of https://github.com/anchor/marquise into error

Conflicts:
	lib/Marquise/IO/Writer.hs
	lib/Marquise/Server.hs
	marquise.cabal
Merge branch 'error' of https://github.com/anchor/marquise into error

Conflicts:
	lib/Marquise/IO/Writer.hs