Move more stuff into configurable world
Merge branch 'develop' of github.com:mozz100/weddingapp into develop