upgrading some modules
Merge branch 'davidgrant' of github.com:dgrant/davidgrant.ca into davidgrant