midway through applying wrapper
Merge branch 'master' into wrapper

* master: (25 commits)
  Better installation process feedback to the user
  Bump modules to provide recommends functionality
  Update Makefile
  Remove border on related tags
  Run Mocha tests and print confirmation message
  Update installation instructions
  Add install task
  Specify latest version of Sass 3.3
  gitignore copied bower templates
  Fix slugignore typo
  Gulp task to copy templates from bower components
  View a users history and reading list
  Temporarily deploy bower_components to fix streams
  Only display 20 new things
  Fix jshint
  Is not followable
  All new notifications in a single stream
  Move history to its own file
  Add doctype
  Remove unused templates that are now being served from components
  ...

Conflicts:
	package.json
	templates/layout.html
moved header and templating setup into next-wrapper
Merge branch 'master' of https://github.com/Financial-Times/next-dobi into wrapper

* 'master' of https://github.com/Financial-Times/next-dobi:
  Bump next-header
  Simplify include of promise polyfill
  Add promise polyfill to fix iOS errors
  Replace header overlay with a link to following page (via o-header)

Conflicts:
	bower.json
	client/main.js
updated to new following button in header
Merge pull request #135 from Financial-Times/wrapper

Wrapper