Initial Jekyll setup
Resolved merge issues to get Jekyll version to work