Merge branch 'gh-pages'
removed production url from _config.yml
Merge branch 'master' into gh-pages