fixes for bwalker8038/generator-bakery#1
fixes for bwalker8038/generator-bakery#2#3#4