Merge pull request #53 from hperrey/namespace_cleanup

Avoid namespace pollution through header files which have 'using' statements
re-added comment in example that got lost at some point
FF fix
Merge pull request #57 from tbisanz/FFfix

FF fix
Merge pull request #44 from tbisanz/guessSensor

Replacing guessSensorID routines (Merge #1)
Merge remote-tracking branch 'upstream/master' into clusterRework