Updated ignore
Config update
Base URL fix
Merge branch 'master' into gh-pages