Added 'bulb' as a 'planted_from' option.
Remove extra whitespace.
Merge branch 'bulb' into dev