Upgraded bootstrap to 3.1.0
Consolidated bootstrap-mods into style.css
Merge branch 'dev' into beta
Merge branch 'beta'