Fix and improve martini integration
Fix and improve martini integration

Small debugging helper left in by mistake, and better debugging for
martini. Also fix an assignment issue that meant that martini wouldn't
reload in dev mode.

acsellers/multitemplate,acsellers/multitemplate