Solve dependency loading problems using autoload
Merge remote-tracking branch 'spontaneous/master' into kitmonsters