Merge branch 'master' into standalone-et-all

* master:
  Refactor gitignore to support comments, \r\n and inclusions, also convert indent to tabs
  Typo that fixes updateorigami
  An empty object is now extended by node.extend instead of defaultDemoConfig to avoid changing its value and therefore remove the bug that only one demo was being generated
  Demo explanation now links to the demo config file spec
  Warns you when you do not have an .editorconfig and tells you had to add it
  Disable selector depth linking.  See https://github.com/Financial-Times/ft-origami/issues/243
  Named es6-promise properly
  Added travis badge
  Added lintspaces to verify
  install now adds the default .editorconfig when the flag editorconfig is passed
  Added travis and gulpfile
  Suggest install instead of update
  Now checks for updates everytime it is used if 24h have passed since the last check

Conflicts:
	lib/tasks/build.js