Other fixes to setup.py
Revert git back to 'timvideos' from 'ryanverner'