Pulling in the custom version of bootstrap using npm
Fixing style issues with new bootstrap
Merge with master