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

Fixed indents
Fixed indents
Merge branch 'master' into hash_functions

Conflicts:
	deltacompression/storage.py