Update bootstrap
Closes #27
Merge pull request #29 from ericschultz/master

Updates