fix load order so custom.el can load installed themes
Merge remote-tracking branch 'upstream/master'