Refactored bar and pie chart
Fixed most issues
Fixed color issues
Restored Gruntfile