Removed Cruft
Merge branch 'master' of https://github.com/wartech0/progeny
Update .gitignore
Merge branch 'master' of https://github.com/wartech0/progeny into wartech0-master
Merge branch 'wartech0-master'
Merge branch 'master' of https://github.com/dkushner/progeny

Conflicts:
	examples/visualization/CMakeLists.txt
	examples/visualization/vtk_display.h