Use 'avalon-r1' tag in Gemfile to prevent install from pulling incompatible versions
Get rid of .rvmrc so we don't have trust issues during upgrade installs
Merge branch 'master' of github.com:avalonmediasystem/avalon

Conflicts:
	Gemfile
	Gemfile.lock
	config/locales/en.yml