Merge branch 'master' of https://github.com/jonschlinkert/foundation into jonschlinkert-master

Conflicts:
	.gitignore
	CONTRIBUTING.md
	Gruntfile.js
	doc/includes/footer.html
	doc/includes/offcanvas-nav.html
	doc/includes/sidebar.html
	doc/layouts/default.html
	doc/pages/components/kitchen_sink.html
	doc/pages/components/thumbnails.html
	doc/pages/components/topbar.html
	doc/pages/javascript.html
	package.json