More cleanup and preparation for the Java Internet of Things Challenge video are in this commit.