Fixed indents
Fixed pylintrc
Merge pull request #7 from zpp-2014-15/fixingspaces

Fixed indents