Update bootstrap with latest work, multiple updates

This commit is contained in:
Troy Dawson 2017-07-12 07:18:02 -07:00
commit f0e4a2790b

File diff suppressed because it is too large Load diff