remove a bunch of dead code
A bunch of small changes from scrutinizer-ci; some tidying, some actual bug fixes
fix indentation
Merge branch 'linting' of git://github.com/shish/shimmie2 into develop

Conflicts:
	ext/resize/main.php
Merge pull request #397 from jgen/develop

Manual Merge of More Linting #391