Tidy up and improve Jekyll configuration