Port to Chart 1.0 API
Clean up cabal file