Merge pull request #270 from jeremyschulman/master

sphinxdoc for Device