append bolus to wizard and remove carbs
moved branch
rename drawBolus to drawbolus
resolve pr comments
fix missing extended rendering
remove guidline
fixed bug where carbs werent shown on top of underrides
update the test page data generator to include wizard events
remove global d3.selects and other bugfixes for viz tests with more than one tideline on a page
update viz tests for lollipops
remove duplicate addPlotType
remove unused code
set plot to bolus, and update filter
move filter into plot return function
added support for string selection to highlight
remove .bolus since .filter is just truthy
fix quick boluses-only test and add failing test for extended boluses
put the viz tests at the top of the testem output, instead of the bottom
Merge branch 'master' into ianjorgensen/lollipop

Conflicts:
	js/index.js
	js/oneday.js
	js/plot/bolus.js
	js/plot/carbs.js
	js/plot/smbg.js
	plugins/blip/chartdailyfactory.js
add test of extralarge bolus tooltip, tooltip on quick bolus