Revert "Revert "Merge pull request #135 from erikvold/bootstrap-update""

This reverts commit 09fd1c75d0ffc1d5f6662d2666fe2012777acd62.