Merge pull request #508 from mattbathje/master

Changes to allow for devices to have custom attributes assigned to them.
Rework of power port conversion to allow for named ports to exist. #235
Doh! #235