removing pep8 violations on 2.0 branch

problems encountered with tab space set to 2. Changed all of that.