Merge pull request #25 from plumgrid/bblanco_dev
author4ast <ast@plumgrid.com>
Mon, 1 Jun 2015 17:31:53 +0000 (10:31 -0700)
committer4ast <ast@plumgrid.com>
Mon, 1 Jun 2015 17:31:53 +0000 (10:31 -0700)
Rename files and a few functions


Trivial merge