Tweak load order; fixes issue with segfault on phin
Merge branch 'master' of github.com:genehack/etc