clean up whitespace in benchmark.py
Bring benchmark.py up-to-date; cleanup speed tests
Fix python 3 syntax in benchmark.py
Merge pull request #1043 from dschult/benchmark_updates

Update and clean up benchmark.py