Reorg and Update to Jekyll 2.0.x