Merge branch 'hotfix/path_fix'
Removing layout files with .html extension - these were being used by Jekyll on app engine instead of the new .liquid files
Providing alternate jekyll config for use with grunt
Merge branch 'hotfix/filename-standardisation' into develop