Updated the installation instructions
Fixed a typo
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	README.md
Updated for the new config folder