i2c fixe-up to deal with a name conflict
Merge pull request #181 from modustollens/dev-uart_speedup

i2c fixed to deal with a name conflict