random changes i never commited
Merge branch 'master' of github.com:aschlick/nocios