merge in lcd4/lcd7 changes (doesnt work yet)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>