One more white-space fix.
Commented out polling.
Cleaned up a bit.
Merge branch 'master', remote-tracking branch 'upstream/master'