A few last minute changes.
Merge branch 'master' of github.com:michaelahlers/team-awesome-wedding