Merge pull request #4 from jrperritt/master

penultimate additions (or so) from `rackspace/gophercloud`