Merge pull request #545 from stoile/master

Cleanup Raspberry Pi plugins