Fixed config, updated README

Config not loading on first start
Added content to README
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md