updating README
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
adding comments
Merge branch 'develop' into brewmaster

Conflicts:
	config.py