minor bug fixes
Merge branch 'master' of https://github.com/cdepatie/uoguelph
Merge branch 'master' of https://github.com/cdepatie/uoguelph
Merge branch 'master' of https://github.com/cdepatie/uoguelph
Merge branch 'master' of https://github.com/cdepatie/uoguelph