Even more refactoring.
Merge branch 'master' of https://github.com/nprapps/Chartbuilder