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

Conflicts:
	README.md
Updated the config location