A couple of unsynced changes from the server end of things
Merge branch 'master' of https://github.com/awoody/wedding