Add .chef to gitignore
Fix htpasswd typo
Merge branch 'master' into nagios
Monitor free disk space, apt, cpu load, memory, ssh, and swap.