Add dnsmasq_config_file flag for nova.conf and template for /etc/dnsmasq-nova.conf
tidy indentation
Merge pull request #255 from mancdaz/master

Merged automatically by jenkins after successful build test