Make the catalyst discovery plugin discover mac addresses
Add support for 3ware disks to puppet discovery plugin
Make the sphinx theme work without main_menu defined.
Merge pull request #488 from deshipu/marcin7

Make the sphinx theme work without main_menu defined