Uart fixes

Just a couple of small fixes.

1. Shortening the poll timeout to speed up flashing. We have talked about this, but neither of us have committed changes for it before.

2. Fixing one of the shadow declaration warnings. Unfortunately, the other one is in simavr.