plasma-umass/doppio — pull request #327 by jvilk (2014-09-12 19:01:52+00:00)
Title: Oops

I... forgot to change my local branch back to master. Merging these before fixing my local branch.