Myself jekyll serve --watch
Merge branch 'master' into gh-pages