Code cleanup
Merge branch 'master' of github.com:bkummel/incubators

Conflicts:
	incubators.html