Fix typo in con-student that broke problem load.
Fix up some indenting.
Merge branch 'master' into stable