final bootstrap changes
Merge pull request #2 from sunny-g/kitchensink

final bootstrap changes