Merge branch 'master' of heroku.com:hymnal-wsf

Conflicts:
	app/views/songs/show.html.erb
Moved song and notice into the same row
Added NewRelic
Merge branch 'master' into production

Conflicts:
	app/views/songs/show.html.erb