Increase the timeout for switch to frame to avoid intermittent failures on travis
Add a comment to explain the extended timeout
Merge pull request #265 from Standard8/sidebar_inter_fail

Increase the timeout for switch to frame to avoid intermittent failures on travis
Change 'to' to 'peer' in the SPA interface to make it consistent with the rest of the interface and the code.
Merge pull request #267 from Standard8/spa_use_peer

Change 'to' to 'peer' in the SPA interface to make it consistent with the rest of the interface and the code.