Merge pull request #11 from brdude/master

Various changes
fixed inconsistency with check_all_disks naming
Merge pull request #13 from Uranellus/master

fixed inconsistency with check_all_disks naming
Merge pull request #14 from brdude/master

Various Changes
fixed missing line break if supplying a host_parent
cleaned up file
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from Uranellus/master

fix and cleanup of templates/host.erb
fixing the dependency cycle that is created when using icinga::command.

Example after creating a icinga::command

```puppet
  icinga::command { 'check_https':
    command_line => '$USER1$/check_http -S -H $HOSTADDRESS$'
  }
```

```dot
digraph Resource_Cycles {
  label = "Resource Cycles"
  "File[/etc/icinga/auto.d/commands/check_https.cfg]" -> "Service[icinga]" -> "Class[Icinga]" ->
  "Icinga::Command[check_https]" -> "File[/etc/icinga/auto.d/commands/check_https.cfg]"
}
```

(File[/etc/icinga/auto.d/commands/check_https.cfg] => Service[icinga] => Class[Icinga] => Icinga::Command[check_https]
=> File[/etc/icinga/auto.d/commands/check_https.cfg])
Merge pull request #17 from Uranellus/master

fixing the dependency cycle that is created when using icinga::command.
Update template syntax for 3.2
Merge pull request #18 from DavidS/master

Updates for puppet 3.2 compatability
revert to the concat module from ripienaar

since the specified concat module rivieraal/concat doesn't seem to exist
revert to the one from ripienaar to satisfy all dependencys
Merge pull request #19 from mburger/master

revert to the concat module from ripienaar
Fix puppet-lint warnings in icinga::params
Merge pull request #20 from smarchive/puppet-lint

Fix puppet-lint warnings in icinga::params
install nrpe-plugin after icinga itself

On wheezy, it is possible that installing the nrpe-plugin pulls
in nagios3 as preferred recommendation. If icinga is already installed,
the recommendation is satisfied and nagios3 is not installed.
Merge pull request #21 from DavidS/master

install nrpe-plugin after icinga itself
fix icinga::cgi

the original version would have created a circular symlink from target
-> config -> target.
Merge pull request #22 from DavidS/master

fix icinga::cgi