Fixes a typo introduced with merge #339
Merge pull request #341 from gem/fix-pep8-novnc

Fixes a typo introduced with merge #339
If not secrets button disabled
Merge branch 'master' of github.com:retspen/webvirtmgr
Remove convert not dir storage
Create VM with rbd storage pool
Update README.md
Update README.md
New novnc wrapper

Added novnc proxy supporting new websockify versions
Merge pull request #346 from casell/websockify

New novnc websockify wrapper
Merged webvirtmgr-novnc-new into a smarter webvirtmgr-novnc
added local_settings to .gitignore
Added help message in case no websockify implementation can be found
Merge pull request #350 from casell/ignorelocalsettings

added local_settings to .gitignore
updated webvirtmgr-novnc-ubuntu
Merge branch 'novnc-ubuntu'

adds support for ubuntu init script default file [/etc/default/webvirtmgr-novnc].
this allows for local customizations of things like the user/group to run as,
the location in which the software is installed, etc.
also includes some changes to better adhere to ubuntu conventions for /run, and
some misc quoting and variable reuse.
Merge pull request #354 from junkb/master

adds support for ubuntu init script default file [/etc/default/webvirtmgr-novnc]
Fix template width
Merge branch 'novncproxymerge' of git://github.com/casell/webvirtmgr into casell-novncproxymerge
Fix pep8