refactoring after moving to jekyll 2.x