Starting Riverside Branch
Merge branch 'Riverside' of https://github.com/mcguia/ratemystream into Riverside