Move config.js to config.js.dist
Merge branch 'master' into config.dist

Conflicts:
	.travis.yml
Merge pull request #75 from adriensamson/config.dist

Move config.js to config.js.dist