psxXtras and Settings now have only one branch

Easier to maintain and we don't need two here anymore