Switch to ggvis
Clean up plotting code