remove track_count from albums, preliminary refactor of videos controller (complete refactor to be completed following addition of multi-site support