Updated gitignore
Minor change to recognize file://
Gitignore change
PEP8 fixes. Reorganized code. Updated for python2/python3 compatibility