Updates to lockers code to fix lockers for 2014/15
Fix trailing whitespace
Merge branch 'master' of https://github.com/EESoc/eesoc-website