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

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