Add simple grid, style demo
fix typo
First thoughts on colors
Merge branch 'master' into feature/auth

* master:
  Fix logo path in README
  fix travis
  Use Django discover runner
  Add test for on_delete in Cookie.owner
Add social apps installed app
Mozilla Persona Login Preview
Merge branch 'master' into feature/auth

* master:
  newline
  Fix gruntfile paths
  node_modules
  Add Bootstrap along with a Gruntfile
u no grid
render with less.js
less.js local, smaller fixes
Unused code
Fixed data file includes
force include_package_data=False
Fix fonts path
Merge branch 'feature/design_base'

* feature/design_base:
  Fix fonts path
  force include_package_data=False
  Fixed data file includes
  Unused code
  less.js local, smaller fixes
  render with less.js
  u no grid
  Mozilla Persona Login Preview
  Add social apps installed app
  First thoughts on colors
  fix typo
  Add simple grid, style demo

Conflicts:
	bakery/settings/base.py
	setup.py