Allow choice of host grouping in Nagios (by entity or by site)
Merge branch 'master' into netdot-1.0
Allow user to set if BGP peerings should be monitored by default