Merge pull request #55 from pmuir/DEVELOPER-960

DEVELOPER-960
DEVELOPER-938

* parse albums wherever we come across them
* always add video page