Tweaks from @ensonics and @Redoubts, and modifications for new ev3dev Jessie image.