Changed tabs with 4 spaces indentation to be consistent with PEP-8 and our code. Removed trailing white spaces
Improved the indentation of the changes done
Fixed broken indentation
Merge pull request #77 from serverdensity/remove-tabs-indentation

Changed tabs with 4 spaces indentation to be consistent with PEP-8 and o...