Merge branch 'shaun'
added address reverse lookup
Merge branch 'master' of https://github.com/theguice/holiday-viz
Merge branch 'shaun'
Rearrange menu
Merge branch 'master' of https://github.com/theguice/holiday-viz
bug fix
Merge branch 'master' into shaun