Fix login.jade, and fix bootstrap column sizing (adam)
Fix bootstrap container sizing (adam)
Merge branch 'adam'