Ensured the depth buffer is cleared on each display()
fixing things
ummm
Merge branch 'master' into edits

Conflicts:
	.travis.yml
	src/Main.cpp
Revert "ummm"

This reverts commit bb5537e14bf18afaad502d417b56beab438888fd, reversing
changes made to 1c01441279e1c1b6d83a68319f2984fbe84eedb0.
well, that was easier than merging....