Changes to allow for devices to have custom attributes assigned to them.
Merge pull request #508 from mattbathje/master

Changes to allow for devices to have custom attributes assigned to them.