Merge remote-tracking branch 'jintu/master'
Merge pull request #14 from JinTu/devel

Fixing up virtual, software and unknown (other) temp sensor handling
Merge pull request #16 from JinTu/devel

Improve range handling for firmware versions 1028-1030
Merge pull request #18 from JinTu/devel

Adding settings to default mode output (Issue #17)
Merge pull request #21 from JinTu/devel

Adding fixes for Issue #20 and initial commit for issue #19
Merge pull request #22 from JinTu/devel

Adding virtual, software and other sensor support to the Cacti templates - Issue #19
Merge branch 'devel'
Merge remote-tracking branch 'upstream-lynix/master' into devel