Prelim support for Bootstrap 3
Merge branch 'master' of github.com:chrismeier/Genotyping

Merging bootstrap 3 integration with whatever was in master