add download lock
various tweaks
fix indentation
fix indentation
Merge branch 'master' of github.com:ddboline/ddboline_personal_scripts

Conflicts:
	record_roku.py

Not sure why this is necessary...