updated readme.rdoc
Merge branch 'master' into initial_config

Conflicts:
	README.rdoc
Merge branch 'initial_config'