Merge branch 'master' into sandbox
Fix for the case when there are more than one nameservers
Host IP should come from DHCP
Merge branch 'master' into sandbox
Merge branch 'sandbox'
passwdless ssh between www-data and root user on controller + same keys for .ssh/ for both root and www-data user
Merge branch 'master' of http://github.com/apoorvemohan/newbaadal