Overhaul of album handling.  Breakage warning.

Committing a broken build so other developers won't get conflicts while
changing an SQL.
Merge branch 'r4' of https://github.com/rmcauley/rainwave into r4