icinga nagios cleanup

moving many files, renaming, clearing out some old configuration and
reenabling spence until ishmael is moved

Change-Id: If44df8858755b33b8049eeee091f8c929ceca975
Merge "icinga nagios cleanup" into production