update README
Merge branch 'upstream' into jenkins-upstream-7
Merge pull request #18 from rackspace-cookbooks/jenkins-upstream-7

merges from rackspace-user - upstream