Fix warnigs after upgrading to Jekyll 2
Merge branch 'master'