after brians updates
Merge branch 'master' of https://github.com/kchemel/imagination-vacation

Conflicts:
	public/atom.xml
	public/sitemap.xml