Updated README to remove reference to roles.yml
Merge remote-tracking branch 'upstream/master' into bootstrap