Move away from streamlicensing
Merge branch 'master' into move-away-from-streamlicensing

Conflicts:
	config/routes.rb
Merge pull request #48 from HollowEarthRadio/move-away-from-streamlicensing

Move away from streamlicensing