Merge branch 'master' of github.com:cfitz/wmu.nu