improved things for albums and link stream context
Merge branch 'river' of https://github.com/hippiehunter/Baconography into river