Merge pull request #1 from berkantaydin/master

PyCharm files will be git ignored
Merge pull request #2 from berkantaydin/master

Fix for PEP8 and Builder fix
Merge pull request #3 from berkantaydin/master

Style things
diff display buggy
Merge pull request #1 from RedXBeard/master

master merge