Merge branch 'master' into gh-pages
fixes #131
really fixes #9
Merge branch 'master' of https://github.com/Quartz/Chartbuilder
mergin
Merge branch 'gh-pages' of https://github.com/Quartz/Chartbuilder into gh-pages