Bootstrap

Merging in Bootstrap changes into master, and closing the branch