Add bundle settings to features
Code style
Merge pull request #1 from mitchmac/master

Updates