Vendor update

bootstrap 2.3.1 -> 3.0.0.
Merge branch 'master' into gh-pages

Conflicts:
	index.html