tidy up a bunch of lint errors
Merge branch 'linting' of git@github.com:shish/shimmie2.git into patch
Merge pull request #386 from shish/linting

A few fixes for things scrutinizer-ci found
use new-style constructors everywhere
Merge pull request #387 from shish/linting

Use new-style constructors everywhere
Merge branch 'develop' of git@github.com:shish/shimmie2.git into patch