Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into ThePirateBay
Merge branch 'ThePirateBay' of https://github.com/mr-orange/Sick-Beard into ThePirateBay
Fixed merge conflicts
Update .gitignore
Fixed merge conflicts
Update version.py
Update .travis.yml
Merge pull request #26 from schumi2004/dutch-pistachitos

Dutch pistachitos
Update versionChecker.py
Merge pull request #29 from schumi2004/dutch-pistachitos

Dutch pistachitos
Merge pull request #30 from schumi2004/dutch-pistachitos

Update inc_top.tmpl
Update inc_top.tmpl
Merge pull request #31 from schumi2004/dutch-tpb

Dutch tpb