Merge remote-tracking branch 'upstream/master' into upstream/2013-12-01_03-49-56
Merge pull request #7 from rackspace-cookbooks/upstream/2013-12-01_03-49-56

upstream/2013-12-01_03-49-56