Cleaned up jekyll-site branch for push to upstream.
Update bower.json to latest versions.
Update README
In-progress; index pages, grunt improvements, retina.js fixes.
Fix tabs v. spaces in Gruntfile
Clean up ignored files, and fix grunt production deployment.
Merge remote-tracking branch 'upstream/jekyll-site' into jekyll-site

Conflicts:
	CNAME
	README.md
	index.html