Upgrade to Jekyll 2.0

Also: some other cleanup and fixes.