Corrects a list error, converts upstream friendly to a header
Merge pull request #144 from chuckbutler/upstream_friendly_bullet

Corrects a list error, converts upstream friendly to a header