bootstrap stuff into master

Added Bootstrap 3.0 integration (which failed).  most of the boilerplate is there but I'm going to bed.