Cleanup of merge problems with BrickPi.py

Cleanup of merge problems.