Adding nginx virtualhosts schwartzmeyer.com and idahothegoodlife.com
Merge remote-tracking branch 'origin/master'

Conflicts:
	site.pp