cleans up more views
fixes somes views
Merge branch 'master' into charts

Conflicts:
	config/initializers/chartkick.rb
removes backups
changes background color for charts for shitty screens