Minor code cleanup.
For Travis CI - switch CI build to use Raspberry-Pi build environment.