Merge remote-tracking branch 'upstream/master' into upstream/2013-11-03_03-49-49
Merge pull request #3 from rackspace-cookbooks/upstream/2013-11-03_03-49-49

upstream/2013-11-03_03-49-49