chart merging style/margin fixes. #370
upgraded rickshaw lib
fix breaking time series in charts with single bucket. fixes #380