merge master, resolves #30
merge master, resolves #30

defenseone/Chartbuilder,johnsonchandra/Chartbuilder,bwareham/Chartbuilder2,SCPR/Chartbuilder,louisstow/Chartbuilder,valdobc/volt-teste,smartkarma/Chartbuilder,correctiv/Chartbuilder,bryceroney/Chartbuilder,zhangweiabc/Chartbuilder,DistilledLtd/Chartbuilder,nowthis/Chartbuilder,NerdWallet/Chartbuilder,kway/Chartbuilder,DistilledLtd/Chartbuilder,NerdWallet/Chartbuilder,taylorhxu/Chartbuilder,bryceroney/Chartbuilder,conversation/Chartbuilder,Quartz/Chartbuilder,kway/Chartbuilder,correctiv/Chartbuilder,bwareham/Chartbuilder2,ducroquet/Chartbuilder,laurenancona/Chartbuilder,taylorhxu/Chartbuilder,nowthis/Chartbuilder,zhangweiabc/Chartbuilder,ajam/Chartbuilder,SCPR/Chartbuilder,ajam/Chartbuilder,defenseone/Chartbuilder,ducroquet/Chartbuilder,louisstow/Chartbuilder,valdobc/volt-teste,laurenancona/Chartbuilder,johnsonchandra/Chartbuilder,Quartz/Chartbuilder