Fix conflict between +bootstrap and +site features.
Merge pull request #13 from edtsech/patch-5

Fix conflict between +bootstrap and +site features.