Upgrade specified jekyll version
Replace deprecated highlight option
atom.xml: use null layout instead of nil
Merge branch 'upgr_2_jekyll'