update stack
Merge branch 'gh-pages' of github.com:kinlane/aggregation into gh-pages

Conflicts:
	data/companies.json