combining pie charts to use same legend
more pie chart improvement
Merge remote-tracking branch 'upstream/master'

Conflicts:
	camping/public/partials/group.html
Merge pull request #60 from wdonnell/master

pie chart stuff