extraneous gbrowse files, commiting before merge
another file to eventually remove
Merge branch 'staging' of github.com:WormBase/website into staging

Deleted files in one repo, modified in another. Removing.

Conflicts:
	conf/gbrowse/pop_demo.conf.new
	conf/gbrowse/slave_preload.conf.new
	conf/gbrowse/yeast_chr1+2.conf.new
	conf/gbrowse/yeast_renderfarm.conf.new
	conf/gbrowse/yeast_simple.conf.new
Merge branch 'staging' of github.com:WormBase/website into staging
Merge branch 'staging' of github.com:WormBase/website into staging