Merge branch 'master' of https://github.com/Financial-Times/next-dobi into restructure

* 'master' of https://github.com/Financial-Times/next-dobi:
  Use older haikro
  Remove commented out line
  Deploy with --verbose
  Force Travis to look at the origami registry
  Missing semi-colon
  Make mistake
  Bring back make test
  Use main app
  Final tweaks
  Fix wrong paths in .gitignore; remove built css
  Haikro -> dep not devDep
  switched to using haikro for deployment

Conflicts:
	.gitignore
	Makefile
	package.json