Update conf.py
added cmdb html
Merge branch 'master' of github.com:wmatyskiewicz/ralph
Fixed undefined names
Merge with upstream repo
Merge pull request #524 from wmatyskiewicz/master

Missing files
Merge pull request #523 from vi4m/cmdb_fixes_undefined_names

Fixed undefined names from pyflakes
Merge branch 'master' of ssh://github.com/allegro/ralph into rq