Attempt at bringing in bootstrap

very messy, creating v2 of master branch.