Updated configuration and filepaths to make it work with Jekyll both locally and remotely on gh-pages
Merge branch 'master' into gh-pages